nexmon – Blame information for rev 1

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 diff -ur hostap-driver-0.4.7/driver/etc/hostap_cs.conf hostap-driver-0.4.7-aircrack-ng/driver/etc/hostap_cs.conf
2 --- hostap-driver-0.4.7/driver/etc/hostap_cs.conf 2005-11-06 14:01:09.000000000 -0500
3 +++ hostap-driver-0.4.7-aircrack-ng/driver/etc/hostap_cs.conf 2006-03-20 14:45:13.000000000 -0500
4 @@ -102,17 +102,17 @@
5  
6 card "Level-One WPC-0100"
7 version "Digital Data Communications", "WPC-0100", "Version 00.00"
8 - manfid 0x0156, 0x0002
9 +# manfid 0x0156, 0x0002
10 bind "hostap_cs"
11  
12 card "Belkin 802.11b WLAN PCMCIA"
13 version "Belkin", "11Mbps Wireless Notebook Network Adapter", "Version 01.02"
14 - manfid 0x0156, 0x0002
15 +# manfid 0x0156, 0x0002
16 bind "hostap_cs"
17  
18 card "Senao SL-2011CD/SL-2011CDPLUS"
19 version "INTERSIL", "HFA384x/IEEE", "Version 01.02"
20 - manfid 0x0156, 0x0002
21 +# manfid 0x0156, 0x0002
22 bind "hostap_cs"
23  
24 card "Fulbond Airbond XI-300B"
25 diff -ur hostap-driver-0.4.7/driver/modules/hostap_80211_tx.c hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_80211_tx.c
26 --- hostap-driver-0.4.7/driver/modules/hostap_80211_tx.c 2005-08-06 13:55:14.000000000 -0400
27 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_80211_tx.c 2006-03-20 14:45:13.000000000 -0500
28 @@ -51,6 +51,9 @@
29 int to_assoc_ap = 0;
30 struct hostap_skb_tx_data *meta;
31  
32 + if (local->iw_mode == IW_MODE_MONITOR)
33 + goto xmit;
34 +
35 if (skb->len < ETH_HLEN) {
36 printk(KERN_DEBUG "%s: hostap_data_start_xmit: short skb "
37 "(len=%d)\n", dev->name, skb->len);
38 @@ -216,6 +219,7 @@
39 memcpy(skb_put(skb, ETH_ALEN), &hdr.addr4, ETH_ALEN);
40 }
41  
42 +xmit:
43 iface->stats.tx_packets++;
44 iface->stats.tx_bytes += skb->len;
45  
46 @@ -377,8 +381,6 @@
47 }
48  
49 if (skb->len < 24) {
50 - printk(KERN_DEBUG "%s: hostap_master_start_xmit: short skb "
51 - "(len=%d)\n", dev->name, skb->len);
52 ret = 0;
53 iface->stats.tx_dropped++;
54 goto fail;
55 diff -ur hostap-driver-0.4.7/driver/modules/hostap.c hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap.c
56 --- hostap-driver-0.4.7/driver/modules/hostap.c 2005-08-06 13:47:10.000000000 -0400
57 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap.c 2006-03-20 14:45:13.000000000 -0500
58 @@ -407,7 +407,7 @@
59 if (local->iw_mode == IW_MODE_REPEAT)
60 return HFA384X_PORTTYPE_WDS;
61 if (local->iw_mode == IW_MODE_MONITOR)
62 - return HFA384X_PORTTYPE_PSEUDO_IBSS;
63 + return 5; /*HFA384X_PORTTYPE_PSEUDO_IBSS;*/
64 return HFA384X_PORTTYPE_HOSTAP;
65 }
66  
67 diff -ur hostap-driver-0.4.7/driver/modules/hostap_config.h hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_config.h
68 --- hostap-driver-0.4.7/driver/modules/hostap_config.h 2005-11-20 20:42:12.000000000 -0500
69 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_config.h 2006-03-20 14:45:13.000000000 -0500
70 @@ -59,7 +59,7 @@
71 * In addition, please note that it is possible to kill your card with
72 * non-volatile download if you are using incorrect image. This feature has not
73 * been fully tested, so please be careful with it. */
74 -/* #define PRISM2_NON_VOLATILE_DOWNLOAD */
75 +#define PRISM2_NON_VOLATILE_DOWNLOAD
76 #endif /* PRISM2_DOWNLOAD_SUPPORT */
77  
78 /* Include wireless extensions sub-ioctl support even if wireless extensions
79 diff -ur hostap-driver-0.4.7/driver/modules/hostap_cs.c hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_cs.c
80 --- hostap-driver-0.4.7/driver/modules/hostap_cs.c 2005-11-06 14:01:09.000000000 -0500
81 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_cs.c 2006-03-20 15:11:53.000000000 -0500
82 @@ -929,53 +929,98 @@
83 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67)
84 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13))
85 static struct pcmcia_device_id hostap_cs_ids[] = {
86 - PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
87 - PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
88 - PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
89 - PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
90 - PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
91 - PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
92 - PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
93 - PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
94 - PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),
95 - PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
96 - PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
97 - PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
98 - PCMCIA_DEVICE_MANF_CARD(0x1668, 0x0101),
99 - PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
100 - PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
101 - PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
102 - PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
103 - PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
104 - PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
105 - PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
106 - 0x7a954bd9, 0x74be00c6),
107 - PCMCIA_DEVICE_PROD_ID1234(
108 - "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
109 - "Eval-RevA",
110 - 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
111 - PCMCIA_DEVICE_PROD_ID123(
112 - "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
113 - 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
114 - PCMCIA_DEVICE_PROD_ID123(
115 - "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
116 - 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
117 - PCMCIA_DEVICE_PROD_ID123(
118 - "Instant Wireless ", " Network PC CARD", "Version 01.02",
119 - 0x11d901af, 0x6e9bd926, 0x4b74baa0),
120 - PCMCIA_DEVICE_PROD_ID123(
121 - "SMC", "SMC2632W", "Version 01.02",
122 - 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
123 - PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
124 - 0x54f7c49c, 0x15a75e5b),
125 - PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
126 - 0x74c5e40d, 0xdb472a18),
127 - PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
128 - 0x0733cc81, 0x0c52f395),
129 - PCMCIA_DEVICE_PROD_ID12(
130 - "ZoomAir 11Mbps High", "Rate wireless Networking",
131 - 0x273fe3db, 0x32a1eaee),
132 - PCMCIA_DEVICE_NULL
133 + PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), // SonicWALL Long Range Wireless Card
134 + PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7110), // D-Link DWL-650 rev P 802.11b WLAN card
135 + PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), // Sohoware NCP110, Philips 802.11b
136 +// PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001), // Intel PRO/Wireless 2011 (Symbol24)
137 + PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002), // AnyPoint(TM) Wireless II PC Card
138 + PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), // 3Com AirConnect PCI 777A
139 + PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), // PROXIM RangeLAN-DS/LAN PC CARD
140 + PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), // Compaq WL100 11 Mbps Wireless Adapter
141 +// PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), // Mostly Lucent Orinoco (HermesI), but also some Prism2 :(
142 +// PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), // Ericsson WLAN Card C11 (Symbol24)
143 +// PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), // Nortel eMobility 802.11 Wireless Adapter (Symbol24)
144 + PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008), // Intermec MobileLAN 11Mbps 802.11b WLAN Card
145 + PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), // Samsung SWL2000-N 11Mb/s WLAN Card
146 +// PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), // AirWay 802.11 Adapter (HermesI)
147 +// PCMCIA_DEVICE_MANF_CARD(0x0268, 0x0001), // ARtem Onair (HermesI)
148 +// PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), // Symbol Technologies LA4111 (Symbol24)
149 + PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0305), // Buffalo WLI-PCM-S11
150 + PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), // Linksys WPC11 Version 2.5
151 + PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), // Linksys WPC11 Version 3
152 + PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), // Compaq HNW-100 11 Mbps Wireless Adapter
153 + PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), // Linksys WCF12 11Mbps 802.11b WLAN Card (Prism 3)
154 + PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), // ASUS SpaceLink WL-100
155 + PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), // SpeedStream SS1021 Wireless Adapter
156 + PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x3021), // SpeedStream SS1021 Wireless Adapter (newer)
157 + PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), // Microsoft Wireless Notebook Adapter MN-520
158 + PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), // PLANEX RoadLannerWave GW-NS11H
159 + PCMCIA_DEVICE_MANF_CARD(0x1668, 0x0101), // ActionTec 802CI2/HCW01170-01
160 + PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), // Airvast ?
161 + PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), // Airvast WN-100
162 + PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), // Adaptec Ultra Wireless ANW-8030
163 + PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008), // CONTEC FLEXSCAN/FX-DDS110-PCC
164 + PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), // Corega KK Wireless LAN PCC-11
165 + PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002), // Conceptronic CON11Cpro, EMTAC A2424i
166 + PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), // Safeway 802.11b, ZCOMAX AirRunner/XI-300
167 + PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), // D-Link DCF660, ZCOMAX XI-325HP 200mw
168 + PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), // SMC2532W-B V2
169 +
170 + PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
171 + PCMCIA_DEVICE_PROD_ID12(" ", "IEEE 802.11 Wireless LAN/PC Card", 0x3b6e20c8, 0xefccafe9),
172 +// PCMCIA_DEVICE_PROD_ID12("3Com", "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3), // Symbol24
173 + PCMCIA_DEVICE_PROD_ID12("ACTIONTEC", "PRISM Wireless LAN PC Card", 0x393089da, 0xa71e69d5),
174 + PCMCIA_DEVICE_PROD_ID123("Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
175 + PCMCIA_DEVICE_PROD_ID123("AIRVAST", "IEEE 802.11b Wireless PCMCIA Card", "HFA3863", 0xea569531, 0x4bcb9645, 0x355cb092),
176 + PCMCIA_DEVICE_PROD_ID12("Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", 0x5cd01705, 0x4271660f),
177 + PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25", 0x78fc06ee, 0xdb9aa842),
178 + PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11B_CF_CARD_25", 0x78fc06ee, 0x45a50c1e),
179 +// PCMCIA_DEVICE_PROD_ID12("Avaya Communication", "Avaya Wireless PC Card", 0xd8a43b78, 0x0d341169), // HermesI
180 + PCMCIA_DEVICE_PROD_ID12("BENQ", "AWL100 PCMCIA ADAPTER", 0x35dadc74, 0x01f7fedb),
181 +// PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-PCM-L11G", 0x2decece3, 0xf57ca4b3), // HermesI
182 + PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 0x2decece3, 0x82067c18),
183 +// PCMCIA_DEVICE_PROD_ID12("Cabletron", "RoamAbout 802.11 DS", 0x32d445f5, 0xedeffd90), // HermesI
184 + PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card", 0x54f7c49c, 0x15a75e5b),
185 + PCMCIA_DEVICE_PROD_ID123("corega", "WL PCCL-11", "ISL37300P", 0x0a21501a, 0x59868926, 0xc9049a39),
186 + PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11", 0x5261440f, 0xa6405584),
187 + PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11", 0x5261440f, 0xdf6115f9),
188 + PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card", 0x71b18589, 0xf144e3ac),
189 + PCMCIA_DEVICE_PROD_ID123("D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02", 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
190 +// PCMCIA_DEVICE_PROD_ID12("D-Link Corporation", "D-Link DWL-650H 11Mbps WLAN Adapter", 0xef544d24, 0xcd8ea916), // Symbol24
191 + PCMCIA_DEVICE_PROD_ID12("Digital Data Communications", "WPC-0100", 0xfdd73470, 0xe0b6f146),
192 +// PCMCIA_DEVICE_PROD_ID12("ELSA", "AirLancer MC-11", 0x4507a33a, 0xef54f0e3), // HermesI
193 + PCMCIA_DEVICE_PROD_ID12("HyperLink", "Wireless PC Card 11Mbps", 0x56cc3f1a, 0x0bcf220c),
194 + PCMCIA_DEVICE_PROD_ID123("Instant Wireless ", " Network PC CARD", "Version 01.02", 0x11d901af, 0x6e9bd926, 0x4b74baa0),
195 +// PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless 2011 LAN PC Card", 0x816cc815, 0x07f58077), // HermesI
196 + PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18),
197 + PCMCIA_DEVICE_PROD_ID12("INTERSIL", "I-GATE 11M PC Card / PC Card plus", 0x74c5e40d, 0x8304ff77),
198 + PCMCIA_DEVICE_PROD_ID1234("Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA", 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
199 + PCMCIA_DEVICE_PROD_ID123("Intersil", "PRISM Freedom PCMCIA Adapter", "ISL37100P", 0x4b801a17, 0xf222ec2d, 0x630d52b2),
200 + PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18),
201 + PCMCIA_DEVICE_PROD_ID12("LeArtery", "SYNCBYAIR 11Mbps Wireless LAN PC Card", 0x7e3b326a, 0x49893e92),
202 + PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card", 0x0733cc81, 0x0c52f395),
203 +// PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/IEEE", 0x23eb9949, 0xc562e72a), // HermesI
204 +// PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11", 0x481e0094, 0x7360e410), // HermesI
205 +// PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11G", 0x481e0094, 0xf57ca4b3), // HermesI
206 + PCMCIA_DEVICE_PROD_ID12("Microsoft", "Wireless Notebook Adapter MN-520", 0x5961bf85, 0x6eec8c01),
207 +// PCMCIA_DEVICE_PROD_ID12("NCR", "WaveLAN/IEEE", 0x24358cd4, 0xc562e72a), // HermesI
208 + PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401 Wireless PC", "Card", 0xa37434e9, 0x9762e8f1),
209 + PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401RA Wireless PC", "Card", 0x0306467f, 0x9762e8f1),
210 +// PCMCIA_DEVICE_PROD_ID12("Nortel Networks", "emobility 802.11 Wireless LAN PC Card", 0x2d617ea0, 0x88cd5767), // Symbol24
211 + PCMCIA_DEVICE_PROD_ID12("OEM", "PRISM2 IEEE 802.11 PC-Card", 0xfea54c90, 0x48f2bdd6),
212 + PCMCIA_DEVICE_PROD_ID12("OTC", "Wireless AirEZY 2411-PCC WLAN Card", 0x4ac44287, 0x235a6bed),
213 + PCMCIA_DEVICE_PROD_ID123("PCMCIA", "11M WLAN Card v2.5", "ISL37300P", 0x281f1c5d, 0x6e440487, 0xc9049a39),
214 + PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110", 0x209f40ab, 0xd9715264),
215 + PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-NS110", 0x209f40ab, 0x46263178),
216 + PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9),
217 + PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
218 + PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
219 +// PCMCIA_DEVICE_PROD_ID1("Symbol Technologies", 0x3f02b4d6), // Symbol24
220 +// PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e), // Symbol24
221 + PCMCIA_DEVICE_PROD_ID123("SMC", "SMC2632W", "Version 01.02", 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
222 + PCMCIA_DEVICE_PROD_ID123("The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
223 + PCMCIA_DEVICE_PROD_ID12("ZoomAir 11Mbps High", "Rate wireless Networking", 0x273fe3db, 0x32a1eaee),
224 + PCMCIA_DEVICE_NULL
225 };
226 MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
227 #endif /* >= 2.6.13 */
228 Only in hostap-driver-0.4.7-aircrack-ng/driver/modules: .hostap_cs.c.swp
229 diff -ur hostap-driver-0.4.7/driver/modules/hostap_hw.c hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_hw.c
230 --- hostap-driver-0.4.7/driver/modules/hostap_hw.c 2005-08-20 12:32:34.000000000 -0400
231 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_hw.c 2006-03-20 14:45:13.000000000 -0500
232 @@ -1005,6 +1005,35 @@
233 return fid;
234 }
235  
236 +static int prism2_monitor_enable(struct net_device *dev)
237 +{
238 + if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE, 5)) {
239 + printk(KERN_DEBUG "Port type setting for monitor mode "
240 + "failed\n");
241 + return -EOPNOTSUPP;
242 + }
243 +
244 + if (hfa384x_cmd(dev, HFA384X_CMDCODE_TEST | (0x0a << 8),
245 + 0, NULL, NULL)) {
246 + printk(KERN_DEBUG "Could not enter testmode 0x0a\n");
247 + return -EOPNOTSUPP;
248 + }
249 +
250 + if (hostap_set_word(dev, HFA384X_RID_CNFWEPFLAGS,
251 + HFA384X_WEPFLAGS_PRIVACYINVOKED |
252 + HFA384X_WEPFLAGS_HOSTENCRYPT |
253 + HFA384X_WEPFLAGS_HOSTDECRYPT)) {
254 + printk(KERN_DEBUG "WEP flags setting failed\n");
255 + return -EOPNOTSUPP;
256 + }
257 +
258 + if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE, 1)) {
259 + printk(KERN_DEBUG "Could not set promiscuous mode\n");
260 + return -EOPNOTSUPP;
261 + }
262 +
263 + return 0;
264 +}
265  
266 static int prism2_reset_port(struct net_device *dev)
267 {
268 @@ -1028,6 +1057,10 @@
269 "port\n", dev->name);
270 }
271  
272 + if (local->iw_mode == IW_MODE_MONITOR)
273 + /* force mode 0x0a after port 0 reset */
274 + return prism2_monitor_enable(dev);
275 +
276 /* It looks like at least some STA firmware versions reset
277 * fragmentation threshold back to 2346 after enable command. Restore
278 * the configured value, if it differs from this default. */
279 @@ -1444,6 +1477,10 @@
280 return 1;
281 }
282  
283 + if (local->iw_mode == IW_MODE_MONITOR)
284 + /* force mode 0x0a after port 0 reset */
285 + prism2_monitor_enable(dev);
286 +
287 local->hw_ready = 1;
288 local->hw_reset_tries = 0;
289 local->hw_resetting = 0;
290 @@ -3260,6 +3297,7 @@
291 local->func->hw_config = prism2_hw_config;
292 local->func->hw_reset = prism2_hw_reset;
293 local->func->hw_shutdown = prism2_hw_shutdown;
294 + local->func->monitor_enable = prism2_monitor_enable;
295 local->func->reset_port = prism2_reset_port;
296 local->func->schedule_reset = prism2_schedule_reset;
297 #ifdef PRISM2_DOWNLOAD_SUPPORT
298 diff -ur hostap-driver-0.4.7/driver/modules/hostap_ioctl.c hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_ioctl.c
299 --- hostap-driver-0.4.7/driver/modules/hostap_ioctl.c 2005-09-18 21:51:47.000000000 -0400
300 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_ioctl.c 2006-03-20 14:45:13.000000000 -0500
301 @@ -1068,33 +1068,7 @@
302  
303 printk(KERN_DEBUG "Enabling monitor mode\n");
304 hostap_monitor_set_type(local);
305 -
306 - if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,
307 - HFA384X_PORTTYPE_PSEUDO_IBSS)) {
308 - printk(KERN_DEBUG "Port type setting for monitor mode "
309 - "failed\n");
310 - return -EOPNOTSUPP;
311 - }
312 -
313 - /* Host decrypt is needed to get the IV and ICV fields;
314 - * however, monitor mode seems to remove WEP flag from frame
315 - * control field */
316 - if (hostap_set_word(dev, HFA384X_RID_CNFWEPFLAGS,
317 - HFA384X_WEPFLAGS_HOSTENCRYPT |
318 - HFA384X_WEPFLAGS_HOSTDECRYPT)) {
319 - printk(KERN_DEBUG "WEP flags setting failed\n");
320 - return -EOPNOTSUPP;
321 - }
322 -
323 - if (local->func->reset_port(dev) ||
324 - local->func->cmd(dev, HFA384X_CMDCODE_TEST |
325 - (HFA384X_TEST_MONITOR << 8),
326 - 0, NULL, NULL)) {
327 - printk(KERN_DEBUG "Setting monitor mode failed\n");
328 - return -EOPNOTSUPP;
329 - }
330 -
331 - return 0;
332 + return local->func->reset_port(dev);
333 }
334  
335  
336 @@ -1160,7 +1134,7 @@
337 local->iw_mode = *mode;
338  
339 if (local->iw_mode == IW_MODE_MONITOR)
340 - hostap_monitor_mode_enable(local);
341 + return hostap_monitor_mode_enable(local);
342 else if (local->iw_mode == IW_MODE_MASTER && !local->host_encrypt &&
343 !local->fw_encrypt_ok) {
344 printk(KERN_DEBUG "%s: defaulting to host-based encryption as "
345 diff -ur hostap-driver-0.4.7/driver/modules/hostap_pci.c hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_pci.c
346 --- hostap-driver-0.4.7/driver/modules/hostap_pci.c 2005-09-17 17:05:08.000000000 -0400
347 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_pci.c 2006-03-20 14:45:13.000000000 -0500
348 @@ -48,6 +48,8 @@
349 { 0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID },
350 /* Samsung MagicLAN SWL-2210P */
351 { 0x167d, 0xa000, PCI_ANY_ID, PCI_ANY_ID },
352 + /* NETGEAR MA311 */
353 + { 0x1385, 0x3872, PCI_ANY_ID, PCI_ANY_ID },
354 { 0 }
355 };
356  
357 diff -ur hostap-driver-0.4.7/driver/modules/hostap_plx.c hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_plx.c
358 --- hostap-driver-0.4.7/driver/modules/hostap_plx.c 2005-09-17 17:05:08.000000000 -0400
359 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_plx.c 2006-03-20 14:45:13.000000000 -0500
360 @@ -98,6 +98,7 @@
361 { 0xc250, 0x0002 } /* EMTAC A2424i */,
362 { 0xd601, 0x0002 } /* Z-Com XI300 */,
363 { 0xd601, 0x0005 } /* Zcomax XI-325H 200mW */,
364 + { 0xd601, 0x0010 } /* Zcomax XI-325H 100mW */,
365 { 0, 0}
366 };
367  
368 diff -ur hostap-driver-0.4.7/driver/modules/hostap_wlan.h hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_wlan.h
369 --- hostap-driver-0.4.7/driver/modules/hostap_wlan.h 2005-08-06 13:55:14.000000000 -0400
370 +++ hostap-driver-0.4.7-aircrack-ng/driver/modules/hostap_wlan.h 2006-03-20 14:45:13.000000000 -0500
371 @@ -591,6 +591,7 @@
372 int (*hw_config)(struct net_device *dev, int initial);
373 void (*hw_reset)(struct net_device *dev);
374 void (*hw_shutdown)(struct net_device *dev, int no_disable);
375 + int (*monitor_enable)(struct net_device *dev);
376 int (*reset_port)(struct net_device *dev);
377 void (*schedule_reset)(local_info_t *local);
378 int (*download)(local_info_t *local,