| 1 |
betelgeuse 07/12/29 23:38:20 |
| 2 |
|
| 3 |
Added: 0.2.8-sk_buff-mac.patch |
| 4 |
digest-linux-wlan-ng-modules-0.2.8-r1 |
| 5 |
Log: |
| 6 |
Add patch to build against kernels later than 2.6.21. Fixes bug #192052. |
| 7 |
(Portage version: 2.1.4_rc11) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-wireless/linux-wlan-ng-modules/files/0.2.8-sk_buff-mac.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/linux-wlan-ng-modules/files/0.2.8-sk_buff-mac.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/linux-wlan-ng-modules/files/0.2.8-sk_buff-mac.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 0.2.8-sk_buff-mac.patch |
| 16 |
=================================================================== |
| 17 |
diff -ru linux-wlan-ng-0.2.8/src/p80211/p80211conv.c linux-wlan-ng-0.2.8.devel/src/p80211/p80211conv.c |
| 18 |
--- linux-wlan-ng-0.2.8/src/p80211/p80211conv.c 2007-03-19 16:37:00.000000000 +0100 |
| 19 |
+++ linux-wlan-ng-0.2.8.devel/src/p80211/p80211conv.c 2007-06-05 18:57:49.234754000 +0200 |
| 20 |
@@ -498,7 +498,9 @@ |
| 21 |
} |
| 22 |
|
| 23 |
skb->protocol = eth_type_trans(skb, netdev); |
| 24 |
- skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ |
| 25 |
+ /* XXX: I *think* this is right. -jeffm */ |
| 26 |
+ skb_reset_mac_header(skb); |
| 27 |
+// skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */ |
| 28 |
|
| 29 |
/* jkriegl: process signal and noise as set in hfa384x_int_rx() */ |
| 30 |
/* jkriegl: only process signal/noise if requested by iwspy */ |
| 31 |
diff -ru linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c linux-wlan-ng-0.2.8.devel/src/p80211/p80211netdev.c |
| 32 |
--- linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c 2007-03-19 16:37:00.000000000 +0100 |
| 33 |
+++ linux-wlan-ng-0.2.8.devel/src/p80211/p80211netdev.c 2007-06-05 19:03:35.952167000 +0200 |
| 34 |
@@ -389,7 +389,7 @@ |
| 35 |
|
| 36 |
/* set up various data fields */ |
| 37 |
skb->dev = dev; |
| 38 |
- skb->mac.raw = skb->data ; |
| 39 |
+ skb_reset_mac_header(skb); |
| 40 |
skb->ip_summed = CHECKSUM_NONE; |
| 41 |
skb->pkt_type = PACKET_OTHERHOST; |
| 42 |
skb->protocol = htons(ETH_P_80211_RAW); |
| 43 |
diff -ru linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c linux-wlan-ng-0.2.8.devel/src/prism2/driver/hfa384x.c |
| 44 |
--- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c 2007-03-19 16:37:00.000000000 +0100 |
| 45 |
+++ linux-wlan-ng-0.2.8.devel/src/prism2/driver/hfa384x.c 2007-06-05 19:04:30.845216000 +0200 |
| 46 |
@@ -3645,7 +3645,7 @@ |
| 47 |
/* the prism2 cards don't return the FCS */ |
| 48 |
datap = skb_put(skb, WLAN_CRC_LEN); |
| 49 |
memset (datap, 0xff, WLAN_CRC_LEN); |
| 50 |
- skb->mac.raw = skb->data; |
| 51 |
+ skb_reset_mac_header(skb); |
| 52 |
|
| 53 |
/* Attach the rxmeta, set some stuff */ |
| 54 |
p80211skb_rxmeta_attach(wlandev, skb); |
| 55 |
diff -ru linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.8.devel/src/prism2/driver/hfa384x_usb.c |
| 56 |
--- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c 2007-03-19 16:37:00.000000000 +0100 |
| 57 |
+++ linux-wlan-ng-0.2.8.devel/src/prism2/driver/hfa384x_usb.c 2007-06-05 19:04:46.641407000 +0200 |
| 58 |
@@ -4255,7 +4255,7 @@ |
| 59 |
/* The prism2 series does not return the CRC */ |
| 60 |
memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN); |
| 61 |
|
| 62 |
- skb->mac.raw = skb->data; |
| 63 |
+ skb_reset_mac_header(skb); |
| 64 |
|
| 65 |
/* Attach the rxmeta, set some stuff */ |
| 66 |
p80211skb_rxmeta_attach(wlandev, skb); |
| 67 |
diff -ru linux-wlan-ng-0.2.8/src/prism2/driver/prism2_pci.c linux-wlan-ng-0.2.8.devel/src/prism2/driver/prism2_pci.c |
| 68 |
--- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_pci.c 2007-03-19 16:37:00.000000000 +0100 |
| 69 |
+++ linux-wlan-ng-0.2.8.devel/src/prism2/driver/prism2_pci.c 2007-06-05 19:33:15.406928000 +0200 |
| 70 |
@@ -275,7 +275,7 @@ |
| 71 |
static int __init prism2pci_init(void) |
| 72 |
{ |
| 73 |
WLAN_LOG_NOTICE("%s Loaded\n", version); |
| 74 |
- return pci_module_init(&prism2_pci_drv_id); |
| 75 |
+ return pci_register_driver(&prism2_pci_drv_id); |
| 76 |
}; |
| 77 |
|
| 78 |
static void __exit prism2pci_cleanup(void) |
| 79 |
Only in linux-wlan-ng-0.2.8.devel/src/prism2/driver: prism2_pci.c~ |
| 80 |
diff -ru linux-wlan-ng-0.2.8/src/prism2/driver/prism2_plx.c linux-wlan-ng-0.2.8.devel/src/prism2/driver/prism2_plx.c |
| 81 |
--- linux-wlan-ng-0.2.8/src/prism2/driver/prism2_plx.c 2007-03-19 16:37:00.000000000 +0100 |
| 82 |
+++ linux-wlan-ng-0.2.8.devel/src/prism2/driver/prism2_plx.c 2007-06-05 19:33:12.758581000 +0200 |
| 83 |
@@ -420,7 +420,7 @@ |
| 84 |
static int __init prism2plx_init(void) |
| 85 |
{ |
| 86 |
WLAN_LOG_NOTICE("%s Loaded\n", version); |
| 87 |
- return pci_module_init(&prism2_plx_drv_id); |
| 88 |
+ return pci_register_driver(&prism2_plx_drv_id); |
| 89 |
}; |
| 90 |
|
| 91 |
static void __exit prism2plx_cleanup(void) |
| 92 |
Only in linux-wlan-ng-0.2.8.devel/src/prism2/driver: prism2_plx.c~ |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.1 net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8-r1 |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8-r1?rev=1.1&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/linux-wlan-ng-modules/files/digest-linux-wlan-ng-modules-0.2.8-r1?rev=1.1&content-type=text/plain |
| 100 |
|
| 101 |
Index: digest-linux-wlan-ng-modules-0.2.8-r1 |
| 102 |
=================================================================== |
| 103 |
MD5 5d86ca7bb4ed458743acd922ff09dae6 linux-wlan-ng-0.2.8.tar.bz2 462193 |
| 104 |
RMD160 1b246f4603589641e4d637205cda39602f586cf2 linux-wlan-ng-0.2.8.tar.bz2 462193 |
| 105 |
SHA256 e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade linux-wlan-ng-0.2.8.tar.bz2 462193 |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
-- |
| 110 |
gentoo-commits@g.o mailing list |
Archives