185845 2007-07-19 08:43 0000 net-wireless/acx-0.3.35_p20070101 compile fails w/2.6.22 2007-07-27 07:53:09 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified All Linux RESOLVED FIXED P2 normal --- 184683 1 thoward1120@comcast.net spb@gentoo.org mobile@gentoo.org thoward1120@comcast.net 2007-07-19 08:43:18 0000 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 thoward1120@comcast.net 2007-07-19 08:47:30 0000 Created an attachment (id=125317) New acx-0.3.35_p20070101.ebuild thoward1120@comcast.net 2007-07-19 08:49:35 0000 Created an attachment (id=125319) acx-0.3.35_p20070101-2.6.22.patch Haven't checked it with other acx versions. thoward1120@comcast.net 2007-07-19 08:54:15 0000 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' thoward1120@comcast.net 2007-07-19 09:09:39 0000 Created an attachment (id=125321) New "New acx-0.3.35_p20070101.ebuild" Sorry. Forgot to keep the <2.6.22 CONFIG_CHECK in. antiflag1980@insightbb.com 2007-07-19 10:25:24 0000 Thanks for the patch and ebuild, compiles and works perfectly. dsd@gentoo.org 2007-07-22 17:58:15 0000 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 thoward1120@comcast.net 2007-07-24 10:49:52 0000 (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? thoward1120@comcast.net 2007-07-24 11:12:19 0000 Created an attachment (id=125863) 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 dsd@gentoo.org 2007-07-27 02:40:39 0000 Latest patch looks good genstef@gentoo.org 2007-07-27 06:15:25 0000 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. thoward1120@comcast.net 2007-07-27 07:53:09 0000 (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. 125317 2007-07-19 08:47 0000 New acx-0.3.35_p20070101.ebuild acx-0.3.35_p20070101.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA3IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L25ldC13aXJlbGVzcy9hY3gvYWN4LTAuMy4zNV9w MjAwNzAxMDEuZWJ1aWxkLHYgMS4yIDIwMDcvMDcvMTUgMDM6Mjg6NTIgbXJfYm9uZXNfIEV4cCAk Cgppbmhlcml0IGxpbnV4LW1vZAoKUEFUQ0hMRVZFTD0ke1BWIyMqX3B9CgpERVNDUklQVElPTj0i RHJpdmVyIGZvciB0aGUgQUNYMTAwIGFuZCBBQ1gxMTEgd2lyZWxlc3MgY2hpcHNldCAoQ2FyZEJ1 cywgUENJLCBVU0IpIgpIT01FUEFHRT0iaHR0cDovL2FjeDEwMC5zb3VyY2Vmb3JnZS5uZXQvIgpT UkNfVVJJPSJodHRwOi8vbGlzYXMuZGUvfmFuZGkvYWN4MTAwLyR7UE59LSR7UEFUQ0hMRVZFTH0u dGFyLmJ6MiIKCkxJQ0VOU0U9IkdQTC0yIGFzLWlzIgpTTE9UPSIwIgpLRVlXT1JEUz0ifmFtZDY0 IH5wcGMgfng4NiIKCklVU0U9ImRlYnVnIgoKUkRFUEVORD0ibmV0LXdpcmVsZXNzL3dpcmVsZXNz LXRvb2xzCgluZXQtd2lyZWxlc3MvYWN4LWZpcm13YXJlIgoKUz0ke1dPUktESVJ9LyR7UE59LSR7 UEFUQ0hMRVZFTH0KCk1PRFVMRV9OQU1FUz0iYWN4KG5ldDoke1N9KSIKQ09ORklHX0NIRUNLPSJX SVJFTEVTU19FWFQgRldfTE9BREVSIgpCVUlMRF9UQVJHRVRTPSJtb2R1bGVzIgoKcGtnX3NldHVw KCkgewoJbGludXgtbW9kX3BrZ19zZXR1cAoJQlVJTERfUEFSQU1TPSItQyAke0tWX0RJUn0gU1VC RElSUz0ke1N9Igp9CgpzcmNfdW5wYWNrKCkgewoJdW5wYWNrICR7QX0KCWNobW9kIHVnK3cgLiAt UgoKCSMgVGhlIGRlZmF1bHQgYWN4X2NvbmZpZy5oIGhhcyBzb21lIHJhdGhlciBvdmVyLXplYWxv dXMgZGVidWcgb3V0cHV0LgoJY2QgJFMKCWlmICEgdXNlIGRlYnVnOyB0aGVuCgkJc2VkIC1pICcv XiNkZWZpbmUgQUNYX0RFQlVHL3MvMi8wLycgYWN4X2NvbmZpZy5oIHx8IGRpZSAiRmFpbGVkIHRv IGRpc2FibGUgZGVidWcgc3VwcG9ydCIKCWZpCglrZXJuZWxfaXMgZ2UgMiA2IDIyICYmIGVwYXRj aCAke0ZJTEVTRElSfS8ke1B9LTIuNi4yMi5wYXRjaAoKfQoKc3JjX2luc3RhbGwoKSB7CglsaW51 eC1tb2Rfc3JjX2luc3RhbGwKCglkb2RvYyBSRUFETUUKfQo= 125319 2007-07-19 08:49 0000 acx-0.3.35_p20070101-2.6.22.patch acx-0.3.35_p20070101-2.6.22.patch text/plain LS0tIGFjeC0yMDA3MDEwMS9wY2kuYy5vcmlnCTIwMDctMDctMTkgMDE6MjU6MTQuMDAwMDAwMDAw IC0wNzAwCisrKyBhY3gtMjAwNzAxMDEvcGNpLmMJMjAwNy0wNy0xOSAwMToyNzoxMS4wMDAwMDAw MDAgLTA3MDAKQEAgLTIxMDQsNyArMjEwNCw3IEBACiAvKiBUT0RPOiBwY2lfc2V0X3Bvd2VyX3N0 YXRlKHBkZXYsIFBDSV9EMCk7ID8gKi8KIAogCS8qIHJlcXVlc3Qgc2hhcmVkIElSUSBoYW5kbGVy ICovCi0JaWYgKHJlcXVlc3RfaXJxKG5kZXYtPmlycSwgYWN4cGNpX2lfaW50ZXJydXB0LCBTQV9T SElSUSwgbmRldi0+bmFtZSwgbmRldikpIHsKKwlpZiAocmVxdWVzdF9pcnEobmRldi0+aXJxLCBh Y3hwY2lfaV9pbnRlcnJ1cHQsIElSUUZfU0hBUkVELCBuZGV2LT5uYW1lLCBuZGV2KSkgewogCQlw cmludGsoIiVzOiByZXF1ZXN0X2lycSBGQUlMRURcbiIsIG5kZXYtPm5hbWUpOwogCQlyZXN1bHQg PSAtRUFHQUlOOwogCQlnb3RvIGRvbmU7Ci0tLSBhY3gtMjAwNzAxMDEvY29tbW9uLmMub3JpZwky MDA3LTA3LTE5IDAxOjI4OjA0LjAwMDAwMDAwMCAtMDcwMAorKysgYWN4LTIwMDcwMTAxL2NvbW1v bi5jCTIwMDctMDctMTkgMDE6Mjk6MjYuMDAwMDAwMDAwIC0wNzAwCkBAIC0yNzU0LDcgKzI3NTQs NyBAQAogCXNrYi0+ZGV2ID0gYWRldi0+bmRldjsKIAlza2ItPmRldi0+bGFzdF9yeCA9IGppZmZp ZXM7CiAKLQlza2ItPm1hYy5yYXcgPSBza2ItPmRhdGE7CisJc2tiX3Jlc2V0X21hY19oZWFkZXIo c2tiKTsKIAlza2ItPmlwX3N1bW1lZCA9IENIRUNLU1VNX05PTkU7CiAJc2tiLT5wa3RfdHlwZSA9 IFBBQ0tFVF9PVEhFUkhPU1Q7CiAJc2tiLT5wcm90b2NvbCA9IGh0b25zKEVUSF9QXzgwMjExX1JB Vyk7Cg== 125321 2007-07-19 09:09 0000 New "New acx-0.3.35_p20070101.ebuild" acx-0.3.35_p20070101.ebuild text/plain IyBDb3B5cmlnaHQgMTk5OS0yMDA3IEdlbnRvbyBGb3VuZGF0aW9uCiMgRGlzdHJpYnV0ZWQgdW5k ZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2MgojICRIZWFk ZXI6IC92YXIvY3Zzcm9vdC9nZW50b28teDg2L25ldC13aXJlbGVzcy9hY3gvYWN4LTAuMy4zNV9w MjAwNzAxMDEuZWJ1aWxkLHYgMS4yIDIwMDcvMDcvMTUgMDM6Mjg6NTIgbXJfYm9uZXNfIEV4cCAk Cgppbmhlcml0IGxpbnV4LW1vZAoKUEFUQ0hMRVZFTD0ke1BWIyMqX3B9CgpERVNDUklQVElPTj0i RHJpdmVyIGZvciB0aGUgQUNYMTAwIGFuZCBBQ1gxMTEgd2lyZWxlc3MgY2hpcHNldCAoQ2FyZEJ1 cywgUENJLCBVU0IpIgpIT01FUEFHRT0iaHR0cDovL2FjeDEwMC5zb3VyY2Vmb3JnZS5uZXQvIgpT UkNfVVJJPSJodHRwOi8vbGlzYXMuZGUvfmFuZGkvYWN4MTAwLyR7UE59LSR7UEFUQ0hMRVZFTH0u dGFyLmJ6MiIKCkxJQ0VOU0U9IkdQTC0yIGFzLWlzIgpTTE9UPSIwIgpLRVlXT1JEUz0ifmFtZDY0 IH5wcGMgfng4NiIKCklVU0U9ImRlYnVnIgoKUkRFUEVORD0ibmV0LXdpcmVsZXNzL3dpcmVsZXNz LXRvb2xzCgluZXQtd2lyZWxlc3MvYWN4LWZpcm13YXJlIgoKUz0ke1dPUktESVJ9LyR7UE59LSR7 UEFUQ0hMRVZFTH0KCk1PRFVMRV9OQU1FUz0iYWN4KG5ldDoke1N9KSIKQlVJTERfVEFSR0VUUz0i bW9kdWxlcyIKCnBrZ19zZXR1cCgpIHsKCWlmIGtlcm5lbF9pcyBnZSAyIDYgMjI7IHRoZW4KCQlD T05GSUdfQ0hFQ0s9IldJUkVMRVNTX0VYVCBGV19MT0FERVIiCgllbHNlCgkJQ09ORklHX0NIRUNL PSJORVRfUkFESU8gRldfTE9BREVSIgoJZmkKCglsaW51eC1tb2RfcGtnX3NldHVwCglCVUlMRF9Q QVJBTVM9Ii1DICR7S1ZfRElSfSBTVUJESVJTPSR7U30iCn0KCnNyY191bnBhY2soKSB7Cgl1bnBh Y2sgJHtBfQoJY2htb2QgdWcrdyAuIC1SCgoJIyBUaGUgZGVmYXVsdCBhY3hfY29uZmlnLmggaGFz IHNvbWUgcmF0aGVyIG92ZXItemVhbG91cyBkZWJ1ZyBvdXRwdXQuCgljZCAkUwoJaWYgISB1c2Ug ZGVidWc7IHRoZW4KCQlzZWQgLWkgJy9eI2RlZmluZSBBQ1hfREVCVUcvcy8yLzAvJyBhY3hfY29u ZmlnLmggfHwgZGllICJGYWlsZWQgdG8gZGlzYWJsZSBkZWJ1ZyBzdXBwb3J0IgoJZmkKCWtlcm5l bF9pcyBnZSAyIDYgMjIgJiYgZXBhdGNoICR7RklMRVNESVJ9LyR7UH0tMi42LjIyLnBhdGNoIAoK fQoKc3JjX2luc3RhbGwoKSB7CglsaW51eC1tb2Rfc3JjX2luc3RhbGwKCglkb2RvYyBSRUFETUUK fQo= 125863 2007-07-24 11:12 0000 Replacement acx-0.3.35_p20070101-2.6.22.patch acx-0.3.35_p20070101-2.6.22.patch text/plain LS0tIGFjeC0yMDA3MDEwMS9wY2kuYy5vcmlnCTIwMDctMDctMjQgMDM6NTc6NDEuMDAwMDAwMDAw IC0wNzAwCisrKyBhY3gtMjAwNzAxMDEvcGNpLmMJMjAwNy0wNy0yNCAwMzo1OToyMC4wMDAwMDAw MDAgLTA3MDAKQEAgLTIxMDQsNyArMjEwNCwxMSBAQAogLyogVE9ETzogcGNpX3NldF9wb3dlcl9z dGF0ZShwZGV2LCBQQ0lfRDApOyA/ICovCiAKIAkvKiByZXF1ZXN0IHNoYXJlZCBJUlEgaGFuZGxl ciAqLworI2lmIExJTlVYX1ZFUlNJT05fQ09ERSA+PSBLRVJORUxfVkVSU0lPTigyLDYsMjEpCQor CWlmIChyZXF1ZXN0X2lycShuZGV2LT5pcnEsIGFjeHBjaV9pX2ludGVycnVwdCwgSVJRRl9TSEFS RUQsIG5kZXYtPm5hbWUsIG5kZXYpKSB7CisjZWxzZQogCWlmIChyZXF1ZXN0X2lycShuZGV2LT5p cnEsIGFjeHBjaV9pX2ludGVycnVwdCwgU0FfU0hJUlEsIG5kZXYtPm5hbWUsIG5kZXYpKSB7Cisj ZW5kaWYJCQogCQlwcmludGsoIiVzOiByZXF1ZXN0X2lycSBGQUlMRURcbiIsIG5kZXYtPm5hbWUp OwogCQlyZXN1bHQgPSAtRUFHQUlOOwogCQlnb3RvIGRvbmU7Ci0tLSBhY3gtMjAwNzAxMDEvY29t bW9uLmMub3JpZwkyMDA3LTA3LTI0IDAzOjU5OjQwLjAwMDAwMDAwMCAtMDcwMAorKysgYWN4LTIw MDcwMTAxL2NvbW1vbi5jCTIwMDctMDctMjQgMDQ6MDE6MjMuMDAwMDAwMDAwIC0wNzAwCkBAIC0y NzUzLDggKzI3NTMsMTEgQEAKIAogCXNrYi0+ZGV2ID0gYWRldi0+bmRldjsKIAlza2ItPmRldi0+ bGFzdF9yeCA9IGppZmZpZXM7Ci0KKyNpZiBMSU5VWF9WRVJTSU9OX0NPREUgPj0gS0VSTkVMX1ZF UlNJT04oMiw2LDIyKQorCXNrYl9yZXNldF9tYWNfaGVhZGVyKHNrYik7CisjZWxzZQogCXNrYi0+ bWFjLnJhdyA9IHNrYi0+ZGF0YTsKKyNlbmRpZgogCXNrYi0+aXBfc3VtbWVkID0gQ0hFQ0tTVU1f Tk9ORTsKIAlza2ItPnBrdF90eXBlID0gUEFDS0VUX09USEVSSE9TVDsKIAlza2ItPnByb3RvY29s ID0gaHRvbnMoRVRIX1BfODAyMTFfUkFXKTsK