[Jaunty, armel] PATCH and RFC

[Amit Kucheria]

On Thu, Apr 30, 2009 at 03:59:27AM +0200, Stefan Bader wrote:
> I should have compiled the whole architecture tree after enabling 
> rtl8187se from the staging tree. I am not sure how this worked before as 
> staging was at least compiled...
> The problematic arch is versatile. For one it has CR_TM defined which 
> rtl8187se does as well. It does never use those, so I would propose the 
> following patch to upstream as well.
> Then again versatile fails because it does not have CONFIG_WIRELESS_EXT 
> set. The other armel variations do. So maybe this should be enabled. 
> Amit, what do you think?
>
> Stefan

>From IRC discussion,

10:35 < amitk> smb: also, why doesn't the rtl driver depend on WIRELESS_EXT or WLAN_80211 or some such thing?
10:35 < smb> most likely because nobody cared and it is in staging
10:37 < amitk> smb: so I guess there is a two-part fixes for this problem. 1. Make rtl driver depend on WLAN_80211 2. Check if PCI=y can be removed
               from ARM flavours 

Answer to 2) No, PCI is explicitly enabled by the ARM flavours. So adding a dep on WIRELESS_EXT and the following patch should be enough.

ACK to this patch.

> I guess we should be allowed to reuse that bug report for those patches 
> as it was caused or is requried for that. Will do that later (after a 
> little nap). Again, not really sure currently why this happened not 
> before. The config options did not seem to have changed in that area...
>
>     UBUNTU: Disable unwanted staging builds
>
>     Bug: #366144
>     BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/366144
>
> -- 
>
> When all other means of communication fail, try words!
>
>

> From cef923d7bce5ae77fdbd3122f5c7dd589db06032 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
> 
> The define 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.5.4.3
> 


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