[patch] make madwifi compile with 2.6.22-rc1

patch to make madwifi 0.9.3 work with Linux 2.6.22-rc1

I forgot to sign-off the patch!

Signed-off-by: GrimRC (Eugene St Leger) <grimrc@yahoo.com>

r2339

Well, it does compile, but only because Madwifi gets disabled. I'll attach a patch fixing the Kconfig file, and a log of what still needs doing (not sure how to fix it myself).

Nigel

Kconfig patch for Madwifi svn 2343.

After the attached fix and mangling the tests for the version being >= 2.6.22 to be >= 2.6.21 so that they're used for 2.6.22-rc1, I still get the following compilation error (and maybe more I can't see yet)...

Regards,

Nigel

drivers/net/wireless/madwifi/net80211/ieee80211_input.c: In function 'ieee80211_defrag': drivers/net/wireless/madwifi/net80211/ieee80211_input.c:1050: error: invalid operands to binary - drivers/net/wireless/madwifi/net80211/ieee80211_input.c:1054: error: invalid operands to binary - drivers/net/wireless/madwifi/net80211/ieee80211_input.c:1068: warning: passing argument 1 of 'memcpy' makes pointer from integer without a cast drivers/net/wireless/madwifi/net80211/ieee80211_input.c:1068: warning: passing argument 1 of 'builtin_memcpy' makes pointer from integer without a cast drivers/net/wireless/madwifi/net80211/ieee80211_input.c: In function 'ieee80211_deliver_data': drivers/net/wireless/madwifi/net80211/ieee80211_input.c:1140: warning: assignment makes integer from pointer without a cast drivers/net/wireless/madwifi/net80211/ieee80211_input.c:1141: warning: assignment makes integer from pointer without a cast drivers/net/wireless/madwifi/net80211/ieee80211_input.c: In function 'forward_mgmt_to_app': drivers/net/wireless/madwifi/net80211/ieee80211_input.c:2274: warning: assignment makes integer from pointer without a cast drivers/net/wireless/madwifi/net80211/ieee80211_input.c: In function 'ieee80211_deliver_l2uf': drivers/net/wireless/madwifi/net80211/ieee80211_input.c:2558: warning: assignment makes integer from pointer without a cast drivers/net/wireless/madwifi/net80211/ieee80211_input.c: In function 'ath_eth_type_trans': drivers/net/wireless/madwifi/net80211/ieee80211_input.c:3734: warning: assignment makes integer from pointer without a cast drivers/net/wireless/madwifi/net80211/ieee80211_input.c:3747: warning: cast to pointer from integer of different size

Replying to NigelCunningham <nigel@nigel.suspend2.net>:

Well, it does compile, but only because Madwifi gets disabled.

Please explain that.

2.6.22-rc1 removes CONFIG_NET_RADIO and adds WLAN_80211 and WLAN_PRE80211. Since Madwifi's Kconfig says it depends on NET_RADIO, there's no way to select it with current svn (the kernel compiles, but without Madwifi being compiled). That's why my patch (above) adds (NET_RADIO WLAN_80211).

Regards,

Nigel

Looks like the standalone madwifi build system will compile but a madwifi patched kernel will not.

Madwifi's Makefile check for wireless support:

	@# check wireless extensions support is enabled
	@if [ -z "$(CONFIG_NET_RADIO)$(CONFIG_WIRELESS_EXT)" ]; then \
	    echo "FAILED"; \
	    echo "Please enable wireless extensions."; \
	    exit 1; \
	fi

Madwifi's Kconfig:

config ATHEROS
	tristate "Atheros PCI/Cardbus cards"
	depends on PCI && NET_RADIO

Considering that madwifi does not currently require the mac80211 stack (WLAN_80211) perhaps the patch should be:

Index: patches/2.6/Kconfig
===================================================================
--- patches/2.6/Kconfig (revision 2343)
+++ patches/2.6/Kconfig (working copy)
@@ -3,7 +3,7 @@

 config ATHEROS
        tristate "Atheros PCI/Cardbus cards"
-       depends on PCI && NET_RADIO
+       depends on PCI && (NET_RADIO || WIRELESS_EXT)
        ---help---
          Say Y here if you intend to attach an Atheros Cardbus or PCI
          wireless Ethernet networking card to your computer.  This

ATHEROS shouldn't depend on PCI, there's AHB too :)

But where is your patch? ;-)

Maybe:

-       depends on PCI && NET_RADIO
+       depends on PCI && (NET_RADIO || (WIRELESS_EXT && WLAN_PRE80211))

Ok. The compile issues I've seen are due to using 64 bit. There's a patch in vanilla 2.6.22 that changes 64 bit architectures to use offsets. I'll attach a patch I'm using to get it working for me. You'll clearly not want to apply it as is because I've changed 2,6,22 to 2,6,21. Apart from that, though, it should be right. I'm using it right now :)

Not tested on 32 bit.

Patch I used to get Madwifi working with 2.6.22-rc1.

OK, it looks like the patch from GrimRC is not correct (as noted by proski on -devel). So, the code is currently not correct on 2.6.22 - release_versions.

I've adapted the patch for current versions of madwifi. You can find it on usrportage.de/uploads/madwifi-hal-0.9.30.13.diff

proposed update for 0.9.3.2

Attached patch proposed for 0.9.3.2 release.

Release candidate for 0.9.3.2 is available as a tarball here.

Hi all. I hope my patch didn't mislead anyone. It seemed to work for me on 2.6.22-rc1, when building 'standalone'. I didn't try 'Kconfig'. Maybe the interface kept changing throughout the release candidates? Or maybe I missed stuff?

I think 2.6.22-rc# where # is a number, appears like a 2.6.22 kernel to the code, even though it is not 2.6.22 (yet). I read the LINUX_VERSION_CODE and KERNEL_VERSION macros, and from *what I remember*, they don't take the rc# bit into account at all.