| blob | f1aa310689deb81b4ec75fb29181316473589a5f |
1 diff -uNr linux-wlan-ng-0.2.8/CHANGES linux-wlan-ng-svn-1832/CHANGES
2 --- linux-wlan-ng-0.2.8/CHANGES 2007-05-04 13:29:27.000000000 +0100
3 +++ linux-wlan-ng-svn-1832/CHANGES 2007-06-27 11:28:14.000000000 +0100
4 @@ -41,6 +41,8 @@
5 * Intersil Corporation as part of PRISM(R) chipset product development.
6 *
7 * --------------------------------------------------------------------
8 + - Tweaks to support Fedora 7 (Dan Williams)
9 + - Support 2.6.22 kernels
10 0.2.8
11 - Fix up a pile of sparse warnings (Pavel Roskin)
12 - Support 2.6.20 kernels (Pavel Roskin)
13 diff -uNr linux-wlan-ng-0.2.8/Configure linux-wlan-ng-svn-1832/Configure
14 --- linux-wlan-ng-0.2.8/Configure 2007-05-07 23:00:22.000000000 +0100
15 +++ linux-wlan-ng-svn-1832/Configure 2007-06-27 11:28:14.000000000 +0100
16 @@ -277,9 +277,9 @@
17 fi
18 write_bool KERN_2_6_17
20 -if [ $VERSION_CODE -gt `version 2 6 21` ] ; then
21 +if [ $VERSION_CODE -gt `version 2 6 22` ] ; then
22 $ECHO "******* WARNING WARNING WARNING *******"
23 - $ECHO "Kernels newer than 2.6.21.x are not supported."
24 + $ECHO "Kernels newer than 2.6.22.x are not supported."
25 $ECHO "******* WARNING WARNING WARNING *******"
26 fi
28 diff -uNr linux-wlan-ng-0.2.8/config.in linux-wlan-ng-svn-1832/config.in
29 --- linux-wlan-ng-0.2.8/config.in 2007-02-09 21:51:58.000000000 +0000
30 +++ linux-wlan-ng-svn-1832/config.in 2007-06-27 11:28:14.000000000 +0100
31 @@ -1,6 +1,6 @@
32 WLAN_VERSION=0
33 WLAN_PATCHLEVEL=2
34 -WLAN_SUBLEVEL=8
35 +WLAN_SUBLEVEL=9
36 WLAN_EXTRAVERSION=
37 #LINUX_SRC=/usr/src/linux
38 PCMCIA_SRC=
39 diff -uNr linux-wlan-ng-0.2.8/etc/udev/rules.d/40-prism2.rules linux-wlan-ng-svn-1832/etc/udev/rules.d/40-prism2.rules
40 --- linux-wlan-ng-0.2.8/etc/udev/rules.d/40-prism2.rules 2006-06-26 16:03:27.000000000 +0100
41 +++ linux-wlan-ng-svn-1832/etc/udev/rules.d/40-prism2.rules 2007-06-27 11:28:14.000000000 +0100
42 @@ -1 +1,2 @@
43 -ACTION=="add",BUS=="usb",DRIVER=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k"
44 +#ACTION=="add",BUS=="usb",DRIVER=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k"
45 +KERNEL="wlan*",ACTION=="add",DRIVERS=="prism2_usb" ,RUN+="/etc/wlan/wlan-udev.sh %k"
46 diff -uNr linux-wlan-ng-0.2.8/src/include/wlan/wlan_compat.h linux-wlan-ng-svn-1832/src/include/wlan/wlan_compat.h
47 --- linux-wlan-ng-0.2.8/src/include/wlan/wlan_compat.h 2007-02-28 15:44:02.000000000 +0000
48 +++ linux-wlan-ng-svn-1832/src/include/wlan/wlan_compat.h 2007-06-27 11:28:14.000000000 +0100
49 @@ -479,6 +479,13 @@
50 #endif
51 #endif /* _LINUX_PROC_FS_H */
53 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
54 +#define skb_reset_mac_header(__a) (__a)->mac.raw = (__a)->data
55 +#define SKB_MAC_HEADER(__a) (__a)->mac.raw
56 +#else
57 +#define SKB_MAC_HEADER(__a) (__a)->mac_header
58 +#endif
59 +
60 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
61 #ifndef INIT_TQUEUE
62 #define PREPARE_TQUEUE(_tq, _routine, _data) \
63 diff -uNr linux-wlan-ng-0.2.8/src/p80211/p80211conv.c linux-wlan-ng-svn-1832/src/p80211/p80211conv.c
64 --- linux-wlan-ng-0.2.8/src/p80211/p80211conv.c 2007-03-19 15:37:00.000000000 +0000
65 +++ linux-wlan-ng-svn-1832/src/p80211/p80211conv.c 2007-06-27 11:28:14.000000000 +0100
66 @@ -498,7 +498,7 @@
67 }
69 skb->protocol = eth_type_trans(skb, netdev);
70 - skb->mac.raw = (unsigned char *) e_hdr; /* new MAC header */
71 + SKB_MAC_HEADER(skb) = (unsigned char *) e_hdr; /* new MAC header */
73 /* jkriegl: process signal and noise as set in hfa384x_int_rx() */
74 /* jkriegl: only process signal/noise if requested by iwspy */
75 diff -uNr linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c linux-wlan-ng-svn-1832/src/p80211/p80211netdev.c
76 --- linux-wlan-ng-0.2.8/src/p80211/p80211netdev.c 2007-03-19 15:37:00.000000000 +0000
77 +++ linux-wlan-ng-svn-1832/src/p80211/p80211netdev.c 2007-06-27 11:28:14.000000000 +0100
78 @@ -389,7 +389,8 @@
80 /* set up various data fields */
81 skb->dev = dev;
82 - skb->mac.raw = skb->data ;
83 + skb_reset_mac_header(skb);
84 +
85 skb->ip_summed = CHECKSUM_NONE;
86 skb->pkt_type = PACKET_OTHERHOST;
87 skb->protocol = htons(ETH_P_80211_RAW);
88 @@ -929,7 +930,7 @@
89 dev->open = p80211knetdev_open;
90 dev->stop = p80211knetdev_stop;
92 -#ifdef CONFIG_NET_WIRELESS
93 +#if defined(CONFIG_NET_WIRELESS) || defined(WIRELESS_EXT)
94 #if ((WIRELESS_EXT < 17) && (WIRELESS_EXT < 21))
95 dev->get_wireless_stats = p80211wext_get_wireless_stats;
96 #endif
97 diff -uNr linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c linux-wlan-ng-svn-1832/src/prism2/driver/hfa384x.c
98 --- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x.c 2007-03-19 15:37:00.000000000 +0000
99 +++ linux-wlan-ng-svn-1832/src/prism2/driver/hfa384x.c 2007-06-27 11:28:14.000000000 +0100
100 @@ -3645,7 +3645,7 @@
101 /* the prism2 cards don't return the FCS */
102 datap = skb_put(skb, WLAN_CRC_LEN);
103 memset (datap, 0xff, WLAN_CRC_LEN);
104 - skb->mac.raw = skb->data;
105 + skb_reset_mac_header(skb);
107 /* Attach the rxmeta, set some stuff */
108 p80211skb_rxmeta_attach(wlandev, skb);
109 diff -uNr linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-svn-1832/src/prism2/driver/hfa384x_usb.c
110 --- linux-wlan-ng-0.2.8/src/prism2/driver/hfa384x_usb.c 2007-03-19 15:37:00.000000000 +0000
111 +++ linux-wlan-ng-svn-1832/src/prism2/driver/hfa384x_usb.c 2007-06-27 11:28:14.000000000 +0100
112 @@ -4255,7 +4255,7 @@
113 /* The prism2 series does not return the CRC */
114 memset(skb_put(skb, WLAN_CRC_LEN), 0xff, WLAN_CRC_LEN);
116 - skb->mac.raw = skb->data;
117 + skb_reset_mac_header(skb);
119 /* Attach the rxmeta, set some stuff */
120 p80211skb_rxmeta_attach(wlandev, skb);