[PATCH] rt2x00: fix build of rt2800lib

[PATCH] rt2x00: fix build of rt2800lib

[Hauke Mehrtens]

rt2x00usb.h uses lots of definitions from linux/usb.h.
---
 drivers/net/wireless/rt2x00/rt2800lib.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 5c7d74a..b601a1a 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -29,6 +29,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/usb.h>
 
 #include "rt2x00.h"
 #ifdef CONFIG_RT2800USB
-- 
1.6.3.3

Re: [PATCH] rt2x00: fix build of rt2800lib

[Bartlomiej Zolnierkiewicz]

Hi,

Could you please tell us more about build problems you have
encountered and which kernel tree this fix is for?

Thanks.

On Sunday 08 November 2009 13:07:01 Hauke Mehrtens wrote:
> rt2x00usb.h uses lots of definitions from linux/usb.h.
> ---
>  drivers/net/wireless/rt2x00/rt2800lib.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index 5c7d74a..b601a1a 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -29,6 +29,7 @@
>  
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> +#include <linux/usb.h>
>  
>  #include "rt2x00.h"
>  #ifdef CONFIG_RT2800USB

Re: [PATCH] rt2x00: fix build of rt2800lib

[Ivo van Doorn]

On Sunday 08 November 2009, Hauke Mehrtens wrote:
> rt2x00usb.h uses lots of definitions from linux/usb.h.

rt2800lib should not depend on either PCI or USB,
so which defines from usb.h are used in rt2x00lib.c?

Ivo

> ---
>  drivers/net/wireless/rt2x00/rt2800lib.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index 5c7d74a..b601a1a 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -29,6 +29,7 @@
>  
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> +#include <linux/usb.h>
>  
>  #include "rt2x00.h"
>  #ifdef CONFIG_RT2800USB

Re: [PATCH] rt2x00: fix build of rt2800lib

[Hauke Mehrtens]

[-- Attachment #1: Type: text/plain, Size: 5650 bytes --]

Hi,

I am building recent wireless-testing. Without my patch I get the
following error while compiling it with CONFIG_RT2800USB=y with
CONFIG_RT2800USB=m it compiles fine without any modifications. Looks
like there is an other problem and my patch does not fix the real problem.

Hauke

  CC      drivers/net/wireless/rt2x00/rt2800lib.o
In file included from drivers/net/wireless/rt2x00/rt2800lib.c:35:
drivers/net/wireless/rt2x00/rt2x00usb.h: In function
'rt2x00usb_vendor_request_sw':
drivers/net/wireless/rt2x00/rt2x00usb.h:205: error: 'USB_DIR_OUT'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:205: error: (Each undeclared
identifier is reported only once
drivers/net/wireless/rt2x00/rt2x00usb.h:205: error: for each function it
appears in.)
drivers/net/wireless/rt2x00/rt2x00usb.h:205: error: 'USB_TYPE_VENDOR'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:205: error: 'USB_RECIP_DEVICE'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function
'rt2x00usb_eeprom_read':
drivers/net/wireless/rt2x00/rt2x00usb.h:223: error: 'USB_DIR_IN'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:223: error: 'USB_TYPE_VENDOR'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:223: error: 'USB_RECIP_DEVICE'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function
'rt2x00usb_register_read':
drivers/net/wireless/rt2x00/rt2x00usb.h:243: error: 'USB_DIR_IN'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:243: error: 'USB_TYPE_VENDOR'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:243: error: 'USB_RECIP_DEVICE'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function
'rt2x00usb_register_read_lock':
drivers/net/wireless/rt2x00/rt2x00usb.h:263: error: 'USB_DIR_IN'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:263: error: 'USB_TYPE_VENDOR'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:263: error: 'USB_RECIP_DEVICE'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function
'rt2x00usb_register_multiread':
drivers/net/wireless/rt2x00/rt2x00usb.h:283: error: 'USB_DIR_IN'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:283: error: 'USB_TYPE_VENDOR'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:283: error: 'USB_RECIP_DEVICE'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function
'rt2x00usb_register_write':
drivers/net/wireless/rt2x00/rt2x00usb.h:303: error: 'USB_DIR_OUT'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:303: error: 'USB_TYPE_VENDOR'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:303: error: 'USB_RECIP_DEVICE'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function
'rt2x00usb_register_write_lock':
drivers/net/wireless/rt2x00/rt2x00usb.h:322: error: 'USB_DIR_OUT'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:322: error: 'USB_TYPE_VENDOR'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:322: error: 'USB_RECIP_DEVICE'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: In function
'rt2x00usb_register_multiwrite':
drivers/net/wireless/rt2x00/rt2x00usb.h:342: error: 'USB_DIR_OUT'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:342: error: 'USB_TYPE_VENDOR'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h:342: error: 'USB_RECIP_DEVICE'
undeclared (first use in this function)
drivers/net/wireless/rt2x00/rt2x00usb.h: At top level:
drivers/net/wireless/rt2x00/rt2x00usb.h:439: warning: 'struct
usb_interface' declared inside parameter list
drivers/net/wireless/rt2x00/rt2x00usb.h:439: warning: its scope is only
this definition or declaration, which is probably not what you want
drivers/net/wireless/rt2x00/rt2x00usb.h:440: warning: 'struct
usb_interface' declared inside parameter list
drivers/net/wireless/rt2x00/rt2x00usb.h:442: warning: 'struct
usb_interface' declared inside parameter list
drivers/net/wireless/rt2x00/rt2x00usb.h:443: warning: 'struct
usb_interface' declared inside parameter list
make[4]: *** [drivers/net/wireless/rt2x00/rt2800lib.o] Error 1
make[3]: *** [drivers/net/wireless/rt2x00] Error 2
make[2]: *** [drivers/net/wireless] Error 2
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Fehler 2


Bartlomiej Zolnierkiewicz wrote:
> Hi,
> 
> Could you please tell us more about build problems you have
> encountered and which kernel tree this fix is for?
> 
> Thanks.
> 
> On Sunday 08 November 2009 13:07:01 Hauke Mehrtens wrote:
>> rt2x00usb.h uses lots of definitions from linux/usb.h.
>> ---
>>  drivers/net/wireless/rt2x00/rt2800lib.c |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
>> index 5c7d74a..b601a1a 100644
>> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
>> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
>> @@ -29,6 +29,7 @@
>>  
>>  #include <linux/kernel.h>
>>  #include <linux/module.h>
>> +#include <linux/usb.h>
>>  
>>  #include "rt2x00.h"
>>  #ifdef CONFIG_RT2800USB


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 898 bytes --]

Re: [PATCH] rt2x00: fix build of rt2800lib

[Bartlomiej Zolnierkiewicz]

On Sunday 08 November 2009 14:27:38 Hauke Mehrtens wrote:
> Hi,
> 
> I am building recent wireless-testing. Without my patch I get the
> following error while compiling it with CONFIG_RT2800USB=y with
> CONFIG_RT2800USB=m it compiles fine without any modifications. Looks
> like there is an other problem and my patch does not fix the real problem.

I've reproduced it here and your patch is fine but it would be better
if rt2x00usb.h would include <linux/usb.h> itself instead of depending on
its users (device drivers) but I'll leave this decision up to Ivo/Gartjan.

I've fixed the issue in the patch introducing the problem ("rt2800: add
rt2800lib (part three)") to preserve bisectability of rt2800usb driver.

Thanks.
-- 
Bartlomiej Zolnierkiewicz

Re: [PATCH] rt2x00: fix build of rt2800lib

[Gertjan van Wingerde]

On 11/08/09 18:31, Bartlomiej Zolnierkiewicz wrote:
> On Sunday 08 November 2009 14:27:38 Hauke Mehrtens wrote:
>> Hi,
>>
>> I am building recent wireless-testing. Without my patch I get the
>> following error while compiling it with CONFIG_RT2800USB=y with
>> CONFIG_RT2800USB=m it compiles fine without any modifications. Looks
>> like there is an other problem and my patch does not fix the real problem.
> 
> I've reproduced it here and your patch is fine but it would be better
> if rt2x00usb.h would include <linux/usb.h> itself instead of depending on
> its users (device drivers) but I'll leave this decision up to Ivo/Gartjan.
> 
> I've fixed the issue in the patch introducing the problem ("rt2800: add
> rt2800lib (part three)") to preserve bisectability of rt2800usb driver.
> 

Actually, including <linux/usb.h> from rt2x00usb.h would be more appropriate.
I'll send a patch for it.

---
Gertjan.