[rt2x00-users] [PATCH 2.6.33] rt2x00: Fix rt2800usb detection in rt2800lib.

Randy Dunlap randy.dunlap at oracle.com
Sun Dec 13 03:54:36 UTC 2009


On Sun, 13 Dec 2009 00:39:39 +0100 Gertjan van Wingerde wrote:

> rt2800lib incorrectly detected whether RT2800USB was enabled because
> it didn't account for a modularized RT2800USB driver.
> 
> Signed-off-by: Gertjan van Wingerde <gwingerde at gmail.com>
> ---
> 
> John, this one is a fix for 2.6.33.
> 
> ---
>  drivers/net/wireless/rt2x00/rt2800lib.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index eb1e1d0..bdc3286 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -33,6 +33,10 @@
>  	Abstract: rt2800 generic device routines.
>   */
>  
> +#ifdef CONFIG_RT2800USB_MODULE
> +#define CONFIG_RT2800USB
> +#endif
> +

The idiom that I am familiar with (and is the common one afaik)
is to use:

#if defined(CONFIG_RT2800USB) || defined(CONFIG_RT2800USB_MODULE)

Besides, it's not nice to muck with kconfig symbols outside of Kconfig files.


>  #include <linux/kernel.h>
>  #include <linux/module.h>


---
~Randy



More information about the users mailing list