[Jaunty, armel] PATCH and RFC

Thu Apr 30 12:36:57 UTC 2009

On Thu, Apr 30, 2009 at 02:14:36PM +0200, Stefan Bader wrote:
> Ok, compile is now over the versatile part. So that would be the changeset applied.
>
> Stefan
>

Comments inline...

> From 19d4230814a04f0d0fe4225dddb7a1960b7acc2e Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader at canonical.com>
> Date: Thu, 30 Apr 2009 09:42:38 +0200
> Subject: [PATCH] UBUNTU: SAUCE: Make rtl8187se depend on WIRELESS_EXT
> 
> Bug: #366144
> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/366144
> 
> Seen to fail to build when this is not set.
> 
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  drivers/staging/rtl8187se/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/staging/rtl8187se/Kconfig b/drivers/staging/rtl8187se/Kconfig
> index 79c225a..236e427 100644
> --- a/drivers/staging/rtl8187se/Kconfig
> +++ b/drivers/staging/rtl8187se/Kconfig
> @@ -1,5 +1,6 @@
>  config RTL8187SE
>  	tristate "RealTek RTL8187SE Wireless LAN NIC driver"
>  	depends on PCI
> +	depends on WIRELESS_EXT
>  	default N
>  	---help---
> -- 
> 1.6.0.4

ACK.

> From c284d70beee9fcaa55e376e7a8a3fb17b5efae75 Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader at canonical.com>
> Date: Thu, 30 Apr 2009 01:47:41 +0200
> Subject: [PATCH] UBUNTU: SAUCE: Remove unused defines in rtl8187se
> 
> Bug: #366144
> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/366144
> 
> The defines do not seem to be used anyway and CR_TE does a namespace collision
> with a define for armel versatile.
> 
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  drivers/staging/rtl8187se/r8180_hw.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/staging/rtl8187se/r8180_hw.h b/drivers/staging/rtl8187se/r8180_hw.h
> index bf38934..e56e30c 100644
> --- a/drivers/staging/rtl8187se/r8180_hw.h
> +++ b/drivers/staging/rtl8187se/r8180_hw.h
> @@ -505,10 +505,12 @@
>  #define BRSR_MBR0   ((1<< 0))
>  #define BRSR_MBR1   ((1<< 1))
>  
> +/* Unused and CR_TE collides with definitions on armel versatile
>  #define CR_RST      ((1<< 4))
>  #define CR_RE       ((1<< 3))
>  #define CR_TE       ((1<< 2))
>  #define CR_MulRW    ((1<< 0))
> +*/
>  
>  #ifdef CONFIG_RTL8185B
>  #define IMR_Dot11hInt	((1<< 25))			// 802.11h Measurement Interrupt
> -- 
> 1.6.0.4
> 

ACK.

> From c2b513a3cab9a98e3b60f1aa532b2bf1c72842b8 Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader at canonical.com>
> Date: Thu, 30 Apr 2009 11:22:55 +0200
> Subject: [PATCH] UBUNTU: SAUCE: Change config to enable RTL8187SE for armel versatile
> 
> Bug: #366144
> BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/366144
> 
> This enables CONFIG_RTL8187SE for armel.versatile as that had not defined
> CONFIG_WIRELESS_EXT
> 
> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  debian/config/armel/config           |    2 ++
>  debian/config/armel/config.imx51     |    2 --
>  debian/config/armel/config.iop32x    |    2 --
>  debian/config/armel/config.ixp4xx    |    2 --
>  debian/config/armel/config.versatile |    1 -
>  5 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/debian/config/armel/config b/debian/config/armel/config
> index 563f7a6..6736d0b 100644
> --- a/debian/config/armel/config
> +++ b/debian/config/armel/config
> @@ -383,6 +383,8 @@ CONFIG_VT_CONSOLE=y
>  # CONFIG_VXFS_FS is not set
>  # CONFIG_WAN is not set
>  CONFIG_WIRELESS=y
> +CONFIG_WIRELESS_EXT=y
> +CONFIG_WIRELESS_EXT_SYSFS=y
>  # CONFIG_WLAN_PRE80211 is not set
>  CONFIG_XFRM=y
>  # CONFIG_XFRM_MIGRATE is not set
> diff --git a/debian/config/armel/config.imx51 b/debian/config/armel/config.imx51
> index b0f614c..7ea0e33 100644
> --- a/debian/config/armel/config.imx51
> +++ b/debian/config/armel/config.imx51
> @@ -1693,8 +1693,6 @@ CONFIG_W1_SLAVE_DS2438=m
>  # CONFIG_WAN_ROUTER is not set
>  CONFIG_WATCHDOG=y
>  CONFIG_WATCHDOG_NOWAYOUT=y
> -CONFIG_WIRELESS_EXT=y
> -CONFIG_WIRELESS_EXT_SYSFS=y
>  CONFIG_WIRELESS_OLD_REGULATORY=y
>  CONFIG_WLAN_80211=y
>  # CONFIG_X25 is not set
> diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x
> index 93d5717..7c48196 100644
> --- a/debian/config/armel/config.iop32x
> +++ b/debian/config/armel/config.iop32x
> @@ -1090,8 +1090,6 @@ CONFIG_VM_EVENT_COUNTERS=y
>  # CONFIG_W1 is not set
>  # CONFIG_WAN_ROUTER is not set
>  # CONFIG_WATCHDOG is not set
> -CONFIG_WIRELESS_EXT=y
> -CONFIG_WIRELESS_EXT_SYSFS=y
>  # CONFIG_WIRELESS_OLD_REGULATORY is not set
>  # CONFIG_WLAN_80211 is not set
>  # CONFIG_X25 is not set
> diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
> index 8d8d735..04293ac 100644
> --- a/debian/config/armel/config.ixp4xx
> +++ b/debian/config/armel/config.ixp4xx
> @@ -1299,8 +1299,6 @@ CONFIG_WAN_ROUTER=m
>  CONFIG_WATCHDOG=y
>  # CONFIG_WATCHDOG_NOWAYOUT is not set
>  # CONFIG_WDTPCI is not set
> -CONFIG_WIRELESS_EXT=y
> -CONFIG_WIRELESS_EXT_SYSFS=y
>  # CONFIG_WIRELESS_OLD_REGULATORY is not set
>  # CONFIG_WLAN_80211 is not set
>  CONFIG_X25=m
> diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile
> index 7c56c96..46a5428 100644
> --- a/debian/config/armel/config.versatile
> +++ b/debian/config/armel/config.versatile
> @@ -789,7 +789,6 @@ CONFIG_VM_EVENT_COUNTERS=y
>  # CONFIG_W1 is not set
>  # CONFIG_WAN_ROUTER is not set
>  # CONFIG_WATCHDOG is not set
> -# CONFIG_WIRELESS_EXT is not set
>  # CONFIG_WIRELESS_OLD_REGULATORY is not set
>  # CONFIG_WLAN_80211 is not set
>  # CONFIG_X25 is not set
> -- 
> 1.6.0.4

NACK. Why is WIRELESS_EXT being disabled from other flavours?

-- 
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit at canonical.com
----------------------------------------------------------------------