compat-wireless-2008-04-20 doesn't build on kernel 2.6.23

compat-wireless-2008-04-20 doesn't build on kernel 2.6.23

[Hauke Mehrtens]

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

I have tested to build compat-wireless-2008-04-20 on kernel 2.6.23 but
it doesn't build. I got the following error:

  CC [M]  compat-wireless-2008-04-20/drivers/net/wireless/ath5k/hw.o
compat-wireless-2008-04-20/drivers/net/wireless/ath5k/hw.c: In function
'ath5k_hw_attach':
compat-wireless-2008-04-20/drivers/net/wireless/ath5k/hw.c:346: error:
'struct pci_dev' has no member named 'is_pcie'
make[4]: *** compat-wireless-2008-04-20/drivers/net/wireless/ath5k/hw.o]
Error 1
make[3]: *** compat-wireless-2008-04-20/drivers/net/wireless/ath5k] Error 2
make[2]: *** compat-wireless-2008-04-20/drivers/net/wireless] Error 2
make[1]: ***
[_module_/home/hmehr/compat-wireless/compat-wireless-2008-04-20] Error 2
make[1]: Leaving directory `/usr/src/kernels/2.6.23.15-80.fc7-x86_64'


The next error I got while building was:

  CC [M]  ompat-wireless-2008-04-20/drivers/net/wireless/b43/main.o
In file included from include/linux/input-polldev.h:12,
                 from
compat-wireless-2008-04-20/drivers/net/wireless/b43/rfkill.h:10,
                 from
compat-wireless-2008-04-20/drivers/net/wireless/b43/b43.h:13,
                 from
compat-wireless-2008-04-20/drivers/net/wireless/b43/main.c:45:
include/linux/input.h:933:1: warning: "BIT" redefined
In file included from include/linux/kernel.h:15,
                 from compat-wireless-2008-04-20/include/net/compat.h:5,
                 from <command line>:1:
compat-wireless-2008-04-20/include/linux/bitops.h:7:1: warning: this is
the location of the previous definition


If you need the full log please mail me.

Hauke


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

Re: compat-wireless-2008-04-20 doesn't build on kernel 2.6.23

[Hauke Mehrtens]

[-- Attachment #1.1: Type: text/plain, Size: 920 bytes --]

The attached patch solves the first problem in ath5k.

--
Hauke


Hauke Mehrtens schrieb:
> I have tested to build compat-wireless-2008-04-20 on kernel 2.6.23 but
> it doesn't build. I got the following error:
> 
>   CC [M]  compat-wireless-2008-04-20/drivers/net/wireless/ath5k/hw.o
> compat-wireless-2008-04-20/drivers/net/wireless/ath5k/hw.c: In function
> 'ath5k_hw_attach':
> compat-wireless-2008-04-20/drivers/net/wireless/ath5k/hw.c:346: error:
> 'struct pci_dev' has no member named 'is_pcie'
> make[4]: *** compat-wireless-2008-04-20/drivers/net/wireless/ath5k/hw.o]
> Error 1
> make[3]: *** compat-wireless-2008-04-20/drivers/net/wireless/ath5k] Error 2
> make[2]: *** compat-wireless-2008-04-20/drivers/net/wireless] Error 2
> make[1]: ***
> [_module_/home/hmehr/compat-wireless/compat-wireless-2008-04-20] Error 2
> make[1]: Leaving directory `/usr/src/kernels/2.6.23.15-80.fc7-x86_64'

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: compat-wireless-2.6.diff --]
[-- Type: text/x-diff; name="compat-wireless-2.6.diff", Size: 899 bytes --]

diff --git a/compat/compat.diff b/compat/compat.diff
index 38f5191..48701f1 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -349,6 +349,18 @@
  };
 --- a/drivers/net/wireless/ath5k/hw.c	2008-03-14 10:32:35.000000000 -0400
 +++ b/drivers/net/wireless/ath5k/hw.c	2008-03-14 10:32:36.000000000 -0400
+@@ -343,7 +343,11 @@
+ 	 * I guess these point to ClockReq but
+ 	 * i'm not sure.)
+ 	 */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
++	if ((ah->ah_version == AR5K_AR5212) && (compat_is_pcie(pdev)) {
++#else
+ 	if ((ah->ah_version == AR5K_AR5212) && (pdev->is_pcie)) {
++#endif
+ 		ath5k_hw_reg_write(ah, 0x9248fc00, 0x4080);
+ 		ath5k_hw_reg_write(ah, 0x24924924, 0x4080);
+ 		ath5k_hw_reg_write(ah, 0x28000039, 0x4080);
 @@ -385,7 +385,11 @@
  	/* reseting PCI on PCI-E cards results card to hang
  	 * and always return 0xffff... so we ingore that flag

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

Re: compat-wireless-2008-04-20 doesn't build on kernel 2.6.23

[Luis R. Rodriguez]

On Sun, Apr 20, 2008 at 9:02 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> The attached patch solves the first problem in ath5k.

ACK. Slightly modified patch applied. New tarball pushed out. Thanks.

  Luis