Bug 185845 – net-wireless/acx-0.3.35_p20070101 compile fails w/2.6.22

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Thomas S. Howard 2007-07-19 08:43:18 UTC]

In response to a forum post about this, I looked into it.  It was a simple fix, but needs to be tested.  Ebuild and patch attached.

Reproducible: Always

[Comment 1 Thomas S. Howard 2007-07-19 08:47:30 UTC]

Created attachment 125317 [details]
New acx-0.3.35_p20070101.ebuild

[Comment 2 Thomas S. Howard 2007-07-19 08:49:35 UTC]

Created attachment 125319 [details, diff]
acx-0.3.35_p20070101-2.6.22.patch

Haven't checked it with other acx versions.

[Comment 3 Thomas S. Howard 2007-07-19 08:54:15 UTC]

Oh, yeah, the original errors:

/var/tmp/portage/net-wireless/acx-0.3.35_p20070101/work/acx-20070101/common.c: In function 'acx_l_rxmonitor':
/var/tmp/portage/net-wireless/acx-0.3.35_p20070101/work/acx-20070101/common.c:2757: error: 'struct sk_buff' has no member named 'mac'
make[1]: *** [/var/tmp/portage/net-wireless/acx-0.3.35_p20070101/work/acx-20070101/common.o] Error 1
make[1]: *** Waiting for unfinished jobs....
/var/tmp/portage/net-wireless/acx-0.3.35_p20070101/work/acx-20070101/pci.c: In function 'acxpci_e_open':
/var/tmp/portage/net-wireless/acx-0.3.35_p20070101/work/acx-20070101/pci.c:2107: warning: 'deprecated_irq_flag' is deprecated (declared at include/linux/interrupt.h:66)
make: *** [_module_/var/tmp/portage/net-wireless/acx-0.3.35_p20070101/work/acx-20070101] Error 2
make: Leaving directory `/usr/src/linux-2.6.22-gentoo-r1'

[Comment 4 Thomas S. Howard 2007-07-19 09:09:39 UTC]

Created attachment 125321 [details, diff]
New "New acx-0.3.35_p20070101.ebuild"

Sorry.  Forgot to keep the <2.6.22 CONFIG_CHECK in.

[Comment 5 keith 2007-07-19 10:25:24 UTC]

Thanks for the patch and ebuild, compiles and works perfectly.

[Comment 6 Daniel Drake (RETIRED) 2007-07-22 17:58:15 UTC]

Thomas, any chance you can improve the patch so that the ebuild can apply it unconditionally?

You can do stuff like:
(random example from another bug)

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+    struct iphdr *ip = ip_hdr(skb);
+#else
     struct iphdr *ip = skb->nh.iph;
+#endif

[Comment 7 Thomas S. Howard 2007-07-24 10:49:52 UTC]

(In reply to comment #6)
> Thomas, any chance you can improve the patch so that the ebuild can apply it
> unconditionally?
> 
> You can do stuff like:
> (random example from another bug)
> 
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
> +    struct iphdr *ip = ip_hdr(skb);
> +#else
>      struct iphdr *ip = skb->nh.iph;
> +#endif
> 
Yeah, that's fine. I actually was going to do it the way you prefer, but thought maybe it was supposed to done in the ebuild, since I saw that madwifi-ng handles it that way.  You want that patch redone too?

[Comment 8 Thomas S. Howard 2007-07-24 11:12:19 UTC]

Created attachment 125863 [details, diff]
Replacement acx-0.3.35_p20070101-2.6.22.patch

Compiles with: 2.6.20-gentoo-r8, 2.6.21-gentoo-r4, 2.6.22-gentoo-r1

[Comment 9 Daniel Drake (RETIRED) 2007-07-27 02:40:39 UTC]

Latest patch looks good

[Comment 10 Stefan Schweizer (RETIRED) 2007-07-27 06:15:25 UTC]

thank you I fixed this. Btw, there is no need for a kernel_is check for CONFIG_CHECK. WIRELESS_EXT is also in use in kernels prior to 2.6.22.

[Comment 11 Thomas S. Howard 2007-07-27 07:53:09 UTC]

(In reply to comment #10)
> thank you I fixed this. Btw, there is no need for a kernel_is check for
> CONFIG_CHECK. WIRELESS_EXT is also in use in kernels prior to 2.6.22.
> 

Yeah, but as far as I know, the driver needs NET_RADIO for a < 2.6.22 kernel, which can be disabled even if WIRELESS_EXT is enabled.  In 2.6.22, NET_RADIO is gone, so I figured WIRELESS_EXT covered it.