diff options
author | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-07-21 10:10:31 +0000 |
commit | b2f192faabe412adce79534e22efe9fb69ee40e2 (patch) | |
tree | 7076c49d4286f8a1733650bd8fbc7161af200d57 /meta/packages/hostap | |
parent | 2cf0eadf9f730027833af802d7e6c90b44248f80 (diff) | |
download | poky-b2f192faabe412adce79534e22efe9fb69ee40e2.tar.gz |
Rename /openembedded/ -> /meta/
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/hostap')
17 files changed, 978 insertions, 0 deletions
diff --git a/meta/packages/hostap/files/hostap-fw-load.patch b/meta/packages/hostap/files/hostap-fw-load.patch new file mode 100644 index 0000000000..88adee2bc9 --- /dev/null +++ b/meta/packages/hostap/files/hostap-fw-load.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- hostap-utils-0.2.4/hostap_fw_load~hostap-fw-load | ||
7 | +++ hostap-utils-0.2.4/hostap_fw_load | ||
8 | @@ -6,9 +6,9 @@ | ||
9 | # Firmware images for the card | ||
10 | # TODO: could try to select correct firmware type automatically | ||
11 | |||
12 | -PRI=/etc/pcmcia/PM010102.HEX | ||
13 | -STA=/etc/pcmcia/RF010802.HEX | ||
14 | -PRISM2_SREC=/usr/local/bin/prism2_srec | ||
15 | +PRI=/etc/pcmcia/pm010102.hex | ||
16 | +STA=/etc/pcmcia/rf010804.hex | ||
17 | +PRISM2_SREC=/usr/sbin/prism2_srec | ||
18 | |||
19 | set -e | ||
20 | |||
diff --git a/meta/packages/hostap/files/hostap_cs.conf b/meta/packages/hostap/files/hostap_cs.conf new file mode 100644 index 0000000000..abf9c7a247 --- /dev/null +++ b/meta/packages/hostap/files/hostap_cs.conf | |||
@@ -0,0 +1,185 @@ | |||
1 | module "hostap_cs" opts "channel=3 iw_mode=2 essid=any ignore_cis_vcc=1" | ||
2 | |||
3 | card "Actiontec 802CI2" | ||
4 | manfid 0x1668, 0x0101 | ||
5 | bind "hostap_cs" | ||
6 | |||
7 | card "AirWay 802.11 Adapter (PCMCIA)" | ||
8 | #version "AirWay", "802.11 Adapter (PCMCIA)" | ||
9 | manfid 0x0261, 0x0002 | ||
10 | bind "hostap_cs" | ||
11 | |||
12 | card "Asus SpaceLink WL110" | ||
13 | manfid 0x02aa,0x0002 | ||
14 | bind "hostap_cs" | ||
15 | |||
16 | ## handhelds.org bug 964 | ||
17 | card "Belkin F5D6060 Ethernet" | ||
18 | #version "PCMCIA", "11M WLAN Card v2.5", "ISL37300P", "RevA" | ||
19 | manfid 0x0274, 0x1612 | ||
20 | bind "hostap_cs" | ||
21 | |||
22 | card "Compaq 11Mbps Wireless PC Card" | ||
23 | manfid 0x028a, 0x0002 | ||
24 | bind "hostap_cs" | ||
25 | |||
26 | card "Compaq WL100 11 Mbps Wireless Adapter" | ||
27 | manfid 0x0138, 0x0002 | ||
28 | bind "hostap_cs" | ||
29 | |||
30 | card "Compaq HNW-100 11 Mbps Wireless Adapter" | ||
31 | manfid 0x028a, 0x0002 | ||
32 | bind "hostap_cs" | ||
33 | |||
34 | card "D-Link DWL-650" | ||
35 | version "D", "Link DWL-650 11Mbps WLAN Card" | ||
36 | bind "hostap_cs" | ||
37 | |||
38 | card "D-Link DRC-650" | ||
39 | version "D", "Link DRC-650 11Mbps WLAN Card" | ||
40 | bind "hostap_cs" | ||
41 | |||
42 | card "D-Link DCF660" | ||
43 | manfid 0xd601, 0x0005 | ||
44 | bind "hostap_cs" | ||
45 | |||
46 | card "Farallon SkyLINE" | ||
47 | version "INTERSIL", "HFA384x/IEEE" | ||
48 | bind "hostap_cs" | ||
49 | |||
50 | card "HyperLink Wireless PC Card 11Mbps" | ||
51 | version "HyperLink", "Wireless PC Card 11Mbps" | ||
52 | bind "hostap_cs" | ||
53 | |||
54 | # card "Intersil PRISM2 11 Mbps Wireless Adapter" | ||
55 | # manfid 0x0156, 0x0002 | ||
56 | # bind "hostap_cs" | ||
57 | |||
58 | card "LA4111 Spectrum24 Wireless LAN PC Card" | ||
59 | version "Symbol Technologies" | ||
60 | bind "hostap_cs" | ||
61 | |||
62 | card "Linksys WPC11 11Mbps 802.11b WLAN Card" | ||
63 | version "Instant Wireless ", " Network PC CARD", "Version 01.02" | ||
64 | bind "hostap_cs" | ||
65 | |||
66 | card "Linksys WCF11 11Mbps 802.11b WLAN Card" | ||
67 | manfid 0x0274, 0x3301 | ||
68 | bind "hostap_cs" | ||
69 | |||
70 | ## handhelds.org bug #790 | ||
71 | card "Linksys Wireless CompactFlash Card WCF12" | ||
72 | manfid 0x028a, 0x0673 | ||
73 | bind "hostap_cs" | ||
74 | |||
75 | card "Linksys WLAN CF Card" | ||
76 | manfid 0x0274, 0x3301 | ||
77 | bind "hostap_cs" | ||
78 | |||
79 | card "NETGEAR MA701 Wireless CF Card" | ||
80 | manfid 0xd601, 0x0002 | ||
81 | bind "hostap_cs" | ||
82 | |||
83 | card "Nortel Networks eMobility 802.11 Wireless Adapter" | ||
84 | manfid 0x01eb, 0x080a | ||
85 | bind "hostap_cs" | ||
86 | |||
87 | card "PLANEX GeoWave GW-CF110" | ||
88 | version "PLANEX", "GeoWave/GW-CF110" | ||
89 | bind "hostap_cs" | ||
90 | |||
91 | card "PROXIM LAN PC CARD HARMONY 80211B" | ||
92 | version "PROXIM", "LAN PC CARD HARMONY 80211B" | ||
93 | bind "hostap_cs" | ||
94 | |||
95 | card "Proxim RangeLAN/DS" | ||
96 | version "PROXIM","RangeLAN-DS/LAN PC CARD" | ||
97 | manfid 0x0126, 0x8000 | ||
98 | bind "hostap_cs" | ||
99 | |||
100 | card "Safeway 802.11b Wireless Adapter" | ||
101 | manfid 0xd601, 0x0002 | ||
102 | bind "hostap_cs" | ||
103 | |||
104 | card "SAMSUNG 11Mbps WLAN Card" | ||
105 | version "SAMSUNG", "11Mbps WLAN Card" | ||
106 | bind "hostap_cs" | ||
107 | |||
108 | # needs firmware upload via hostap_fw_load | ||
109 | card "SanDisk ConnectPlus OEM (0MB)" | ||
110 | manfid 0xd601, 0x0010 | ||
111 | bind "hostap_cs" | ||
112 | |||
113 | # needs special activation (>=hostap 0.3.2 only) plus firmware upload | ||
114 | card "SanDisk ConnectPlus w/ Memory" | ||
115 | version "SanDisk", "ConnectPlus" | ||
116 | manfid 0xd601, 0x0101 | ||
117 | bind "hostap_cs" to 0 | ||
118 | # bind "ide-cs" to 1 | ||
119 | |||
120 | card "Senao/Origo 80211b WLAN Card" | ||
121 | manfid 0x000b,0x7100 | ||
122 | bind "hostap_cs" | ||
123 | |||
124 | card "Sitecom WL-007 WLAN CF Card" | ||
125 | manfid 0xd601, 0x0004 | ||
126 | bind "hostap_cs" | ||
127 | |||
128 | card "SMC2632 802.11 (prism2) Card" | ||
129 | version "SMC", "SMC2632W", "Version 01.02", "" | ||
130 | bind "hostap_cs" | ||
131 | |||
132 | card "SpeedStream SS1021 Wireless Adapter" | ||
133 | #version "Siemens", "SpeedStream Wireless PCMCIA" | ||
134 | manfid 0x02ac, 0x0002 | ||
135 | bind "hostap_cs" | ||
136 | |||
137 | card "ZCOMAX AirRunner/XI-300" | ||
138 | #version "ZCOMAX", "AirRunner/XI-300" | ||
139 | manfid 0xd601, 0x0002 | ||
140 | bind "hostap_cs" | ||
141 | |||
142 | card "Zonet ZCF1100" | ||
143 | manfid 0x000b, 0x7100 | ||
144 | bind "hostap_cs" | ||
145 | |||
146 | card "Wireless LAN Adapter Version 01.02" | ||
147 | version "Wireless", "LAN Adapter", "Version 01.02" | ||
148 | # manfid 0x0156, 0x0002 | ||
149 | bind "hostap_cs" | ||
150 | |||
151 | card "Ambicom WL1100C 11Mbs Card 802.11b" | ||
152 | version "AmbiCom", "WL1100C 802.11b CF-Card", "2.2" | ||
153 | manfid 0xd601,0x0002 | ||
154 | bind "hostap_cs" | ||
155 | |||
156 | card "Ambicom WL1100C 11Mbs Card 802.11b" | ||
157 | manfid 0xd601,0x0002 | ||
158 | bind "hostap_cs" | ||
159 | |||
160 | card "Sandisk Connect SDWCFB-000" | ||
161 | manfid 0xd601,0x0005 | ||
162 | bind "hostap_cs" | ||
163 | |||
164 | # Cards with Intersil firmware (Prism chipset) | ||
165 | |||
166 | card "Linksys WPC11 11Mbps 802.11b WLAN Card" | ||
167 | version "The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", "RevA" | ||
168 | bind "hostap_cs" | ||
169 | |||
170 | card "Linksys CompactFlash Wireless Card" | ||
171 | version "Linksys", "Wireless CompactFlash Card" | ||
172 | bind "hostap_cs" | ||
173 | |||
174 | card "ACTIONTEC PRISM Wireless LAN PC Card" | ||
175 | version "ACTIONTEC", "PRISM Wireless LAN PC Card" | ||
176 | bind "hostap_cs" | ||
177 | |||
178 | card "Linksys WPC11 Version 3" | ||
179 | manfid 0x0274,0x1613 | ||
180 | bind "hostap_cs" | ||
181 | |||
182 | card "BENQ AWL100" | ||
183 | version "BENQ", "AWL100 PCMCIA ADAPTER" | ||
184 | bind "hostap_cs" | ||
185 | |||
diff --git a/meta/packages/hostap/files/hostap_cs.conf-upstream b/meta/packages/hostap/files/hostap_cs.conf-upstream new file mode 100644 index 0000000000..5b7385a7cb --- /dev/null +++ b/meta/packages/hostap/files/hostap_cs.conf-upstream | |||
@@ -0,0 +1,191 @@ | |||
1 | device "hostap_cs" | ||
2 | class "network" module "hostap", "hostap_cs" | ||
3 | |||
4 | card "Intersil PRISM2 Reference Design 11Mb/s WLAN Card" | ||
5 | version "INTERSIL", "HFA384x/IEEE" | ||
6 | bind "hostap_cs" | ||
7 | |||
8 | card "Compaq WL100 11Mb/s WLAN Card" | ||
9 | manfid 0x0138, 0x0002 | ||
10 | bind "hostap_cs" | ||
11 | |||
12 | card "Compaq WL200" | ||
13 | version "Compaq", "WL200_11Mbps_Wireless_PCI_Card" | ||
14 | bind "hostap_cs" | ||
15 | |||
16 | card "EMTAC A2424i 11Mbps WLAN Card" | ||
17 | manfid 0xc250, 0x0002 | ||
18 | # cis "cis/Emtac.dat" | ||
19 | bind "hostap_cs" | ||
20 | |||
21 | card "Linksys WPC11 11Mbps WLAN Card" | ||
22 | version "Instant Wireless ", " Network PC CARD", "Version 01.02" | ||
23 | bind "hostap_cs" | ||
24 | |||
25 | card "Linksys WPC11 Ver 2.5 11Mbps WLAN Card" | ||
26 | manfid 0x0274, 0x1612 | ||
27 | bind "hostap_cs" | ||
28 | |||
29 | card "Linksys WPC11 Ver 3 11Mbps WLAN Card" | ||
30 | manfid 0x0274, 0x1613 | ||
31 | bind "hostap_cs" | ||
32 | |||
33 | card "Linksys WCF12 Wireless CompactFlash Card" | ||
34 | version "Linksys", "Wireless CompactFlash Card" | ||
35 | bind "hostap_cs" | ||
36 | |||
37 | card "D-Link DWL-650 11Mbps WLAN Card" | ||
38 | version "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02" | ||
39 | bind "hostap_cs" | ||
40 | |||
41 | card "D-Link DRC-650 11Mbps WLAN Card" | ||
42 | # version "D", "Link DRC-650 11Mbps WLAN Card", "Version 01.02" | ||
43 | manfid 0x028a, 0x0002 | ||
44 | bind "hostap_cs" | ||
45 | |||
46 | card "ZoomAir 4100 11Mb/s WLAN Card" | ||
47 | version "ZoomAir 11Mbps High", "Rate wireless Networking" | ||
48 | bind "hostap_cs" | ||
49 | |||
50 | card "Addtron AWP-100 11Mbps WLAN Card" | ||
51 | version "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02" | ||
52 | bind "hostap_cs" | ||
53 | |||
54 | card "Samsung SWL2000-N 11Mb/s WLAN Card" | ||
55 | manfid 0x0250, 0x0002 | ||
56 | bind "hostap_cs" | ||
57 | |||
58 | card "SMC 2632W 11Mbps WLAN Card" | ||
59 | version "SMC", "SMC2632W", "Version 01.02" | ||
60 | bind "hostap_cs" | ||
61 | |||
62 | card "BroMax Freeport 11Mbps WLAN Card" | ||
63 | version "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA" | ||
64 | bind "hostap_cs" | ||
65 | |||
66 | card "Z-Com XI300 11Mb/s WLAN Card" | ||
67 | manfid 0xd601, 0x0002 | ||
68 | bind "hostap_cs" | ||
69 | |||
70 | card "Zcomax XI-325H 200mW" | ||
71 | # version " ", "IEEE 802.11 Wireless LAN/PC Card" | ||
72 | manfid 0xd601, 0x0005 | ||
73 | bind "hostap_cs" | ||
74 | |||
75 | card "3Com AirConnect PCI 777A" | ||
76 | manfid 0x0101, 0x0777 | ||
77 | bind "hostap_cs" | ||
78 | |||
79 | card "U.S. Robotics IEEE 802.11b PC-CARD" | ||
80 | version "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02" | ||
81 | # manfid 0x0156, 0x0002 | ||
82 | bind "hostap_cs" | ||
83 | |||
84 | card "Longshine LCR-8531 11Mbps WLAN PCMCIA CARD" | ||
85 | version "OEM", "PRISM2 IEEE 802.11 PC-Card", "Version 01.02" | ||
86 | # manfid 0x0156, 0x0002 | ||
87 | bind "hostap_cs" | ||
88 | |||
89 | card "Philips 802.11b WLAN PCMCIA" | ||
90 | manfid 0x000b, 0x7300 | ||
91 | bind "hostap_cs" | ||
92 | |||
93 | card "Proxim RangeLAN" | ||
94 | # version "PROXIM", "RangeLAN-DS/LAN PC CARD" | ||
95 | manfid 0x0126, 0x8000 | ||
96 | bind "hostap_cs" | ||
97 | |||
98 | card "Buffalo WLI-CF-S11G" | ||
99 | version "BUFFALO", "WLI-CF-S11G" | ||
100 | # manfid 0x026f, 0x030b | ||
101 | bind "hostap_cs" | ||
102 | |||
103 | card "Level-One WPC-0100" | ||
104 | version "Digital Data Communications", "WPC-0100", "Version 00.00" | ||
105 | manfid 0x0156, 0x0002 | ||
106 | bind "hostap_cs" | ||
107 | |||
108 | card "Belkin 802.11b WLAN PCMCIA" | ||
109 | version "Belkin", "11Mbps Wireless Notebook Network Adapter", "Version 01.02" | ||
110 | manfid 0x0156, 0x0002 | ||
111 | bind "hostap_cs" | ||
112 | |||
113 | card "Senao SL-2011CD/SL-2011CDPLUS" | ||
114 | version "INTERSIL", "HFA384x/IEEE", "Version 01.02" | ||
115 | manfid 0x0156, 0x0002 | ||
116 | bind "hostap_cs" | ||
117 | |||
118 | card "Fulbond Airbond XI-300B" | ||
119 | version " ", "IEEE 802.11 Wireless LAN/PC Card" | ||
120 | manfid 0xd601, 0x0002 | ||
121 | bind "hostap_cs" | ||
122 | |||
123 | card "Netgear MA401" | ||
124 | version "NETGEAR MA401 Wireless PC", "Card", "Version 01.00" | ||
125 | # manfid 0x0156, 0x0002 | ||
126 | bind "hostap_cs" | ||
127 | |||
128 | card "D-Link DWL-650 Rev. P1" | ||
129 | version "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10", "A3" | ||
130 | # manfid 0x000b, 0x7110 | ||
131 | bind "hostap_cs" | ||
132 | |||
133 | card "SonicWALL Long Range Wireless Card" | ||
134 | version "SonicWALL", "Long Range Wireless Card", "ISL37100P", "1.0" | ||
135 | manfid 0x000b, 0x7100 | ||
136 | bind "hostap_cs" | ||
137 | |||
138 | card "Senao NL-2011CD PLUS Ext2 Mercury" | ||
139 | version "WLAN", "11Mbps_PC-Card_3.0", "ISL37100P", "Eval-RevA" | ||
140 | manfid 0x000b, 0x7100 | ||
141 | bind "hostap_cs" | ||
142 | |||
143 | card "Airvast WL100" | ||
144 | version "AIRVAST", "IEEE 802.11b Wireless PCMCIA Card", "HFA3863" | ||
145 | manfid 0x50c2, 0x0001 | ||
146 | bind "hostap_cs" | ||
147 | |||
148 | card "Microsoft Wireless Notebook Adapter MN-520 1.0.3" | ||
149 | version "Microsoft", "Wireless Notebook Adapter MN-520", "", "1.0.3" | ||
150 | manfid 0x02d2, 0x0001 | ||
151 | bind "hostap_cs" | ||
152 | |||
153 | card "NETGEAR MA401RA" | ||
154 | version "NETGEAR MA401RA Wireless PC", "Card", "ISL37300P", "Eval-RevA" | ||
155 | manfid 0x000b, 0x7300 | ||
156 | bind "hostap_cs" | ||
157 | |||
158 | card "Allied Telesyn AT-WCL452" | ||
159 | version "Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", "Ver. 1.00" | ||
160 | manfid 0xc00f, 0x0000 | ||
161 | bind "hostap_cs" | ||
162 | |||
163 | card "corega WL PCCL-11" | ||
164 | version "corega", "WL PCCL-11", "ISL37300P", "RevA" | ||
165 | manfid 0xc00f, 0x0000 | ||
166 | bind "hostap_cs" | ||
167 | |||
168 | card "SanDisk ConnectPlus" | ||
169 | version "SanDisk", "ConnectPlus" | ||
170 | manfid 0xd601, 0x0101 | ||
171 | bind "hostap_cs" to 0 | ||
172 | bind "ide-cs" to 1 | ||
173 | |||
174 | card "ASUS WL-100 8011b WLAN PC Card" | ||
175 | version "ASUS", "802_11b_PC_CARD_25", "Version 01.00" | ||
176 | manfid 0x02aa, 0x0002 | ||
177 | bind "hostap_cs" | ||
178 | |||
179 | card "ZyXel Zyair B-101 802.11b WLAN card" | ||
180 | version " ", "IEEE 802.11 Wireless LAN/PC Card" | ||
181 | manfid 0xd601, 0x0010 | ||
182 | bind "hostap_cs" | ||
183 | |||
184 | card "WLAN PRISM PCMCIA CARD 37300P RevB6" | ||
185 | version "WLAN", "PRISM PCMCIA CARD", "37300P", "Revision B6" | ||
186 | manfid 0x50c2, 0x7300 | ||
187 | bind "hostap_cs" | ||
188 | |||
189 | |||
190 | # Optional configuration parameters for hostap_cs.o | ||
191 | # module "hostap_cs" opts "channel=3 iw_mode=3 essid=test ignore_cis_vcc=0" | ||
diff --git a/meta/packages/hostap/hostap-conf_1.0.bb b/meta/packages/hostap/hostap-conf_1.0.bb new file mode 100644 index 0000000000..094722c845 --- /dev/null +++ b/meta/packages/hostap/hostap-conf_1.0.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" | ||
2 | MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" | ||
3 | SECTION = "kernel/modules" | ||
4 | PRIORITY = "optional" | ||
5 | LICENSE = "GPL" | ||
6 | PACKAGE_ARCH = "all" | ||
7 | PR = "r4" | ||
8 | |||
9 | SRC_URI = "file://hostap_cs.conf \ | ||
10 | file://hostap_cs.conf-upstream" | ||
11 | |||
12 | do_install() { | ||
13 | install -d ${D}${sysconfdir}/pcmcia | ||
14 | install -m 0644 ${WORKDIR}/hostap_cs.conf-upstream ${D}${sysconfdir}/pcmcia/hostap_cs.conf | ||
15 | cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf | ||
16 | } | ||
diff --git a/meta/packages/hostap/hostap-modules.inc b/meta/packages/hostap/hostap-modules.inc new file mode 100644 index 0000000000..5ce5e0db67 --- /dev/null +++ b/meta/packages/hostap/hostap-modules.inc | |||
@@ -0,0 +1,39 @@ | |||
1 | DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" | ||
2 | SECTION = "kernel/modules" | ||
3 | PRIORITY = "optional" | ||
4 | MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" | ||
5 | LICENSE = "GPL" | ||
6 | |||
7 | SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz" | ||
8 | |||
9 | SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ | ||
10 | file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" | ||
11 | |||
12 | SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " | ||
13 | |||
14 | S = "${WORKDIR}/hostap-driver-${PV}" | ||
15 | |||
16 | inherit module | ||
17 | |||
18 | # Hack Alert :D | ||
19 | ARCH_mipsel = "mips" | ||
20 | MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" | ||
21 | |||
22 | NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" | ||
23 | |||
24 | do_install() { | ||
25 | install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ | ||
26 | ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia | ||
27 | for i in ${NET_MODULES} | ||
28 | do | ||
29 | install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ | ||
30 | done | ||
31 | install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ | ||
32 | } | ||
33 | |||
34 | PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" | ||
35 | FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" | ||
36 | FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" | ||
37 | FILES_hostap-modules = "/lib/modules/" | ||
38 | RDEPENDS_hostap-modules-cs = "hostap-modules (${PV}) hostap-conf" | ||
39 | RDEPENDS_hostap-modules-pci = "hostap-modules (${PV})" | ||
diff --git a/meta/packages/hostap/hostap-modules/Makefile.patch b/meta/packages/hostap/hostap-modules/Makefile.patch new file mode 100644 index 0000000000..2fc5e9ed4b --- /dev/null +++ b/meta/packages/hostap/hostap-modules/Makefile.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- hostap-driver-0.2.4/Makefile.old 2004-07-31 10:35:50.000000000 +0100 | ||
2 | +++ hostap-driver-0.2.4/Makefile 2004-07-31 10:35:56.000000000 +0100 | ||
3 | @@ -51,7 +51,7 @@ | ||
4 | |||
5 | VERFILE := $(KERNEL_PATH)/include/linux/version.h | ||
6 | KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \ | ||
7 | - then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \ | ||
8 | + then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \ | ||
9 | else uname -r; fi) | ||
10 | KERNELVER := $(shell echo "$(KERNELRELEASE)" | \ | ||
11 | sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/") | ||
diff --git a/meta/packages/hostap/hostap-modules/add_event.patch b/meta/packages/hostap/hostap-modules/add_event.patch new file mode 100644 index 0000000000..d5f2a10e86 --- /dev/null +++ b/meta/packages/hostap/hostap-modules/add_event.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Index: hostap-driver-0.3.7/driver/modules/hostap_cs.c | ||
2 | =================================================================== | ||
3 | --- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-08-03 17:05:53.000000000 +0100 | ||
4 | +++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-08-03 17:07:59.000000000 +0100 | ||
5 | @@ -526,11 +526,13 @@ | ||
6 | dev_list = link; | ||
7 | client_reg.dev_info = &dev_info; | ||
8 | client_reg.Attributes = INFO_IO_CLIENT; | ||
9 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) | ||
10 | client_reg.EventMask = CS_EVENT_CARD_INSERTION | | ||
11 | CS_EVENT_CARD_REMOVAL | | ||
12 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
13 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
14 | client_reg.event_handler = &prism2_event; | ||
15 | +#endif | ||
16 | client_reg.Version = 0x0210; | ||
17 | client_reg.event_callback_args.client_data = link; | ||
18 | ret = pcmcia_register_client(&link->handle, &client_reg); | ||
19 | @@ -913,6 +915,9 @@ | ||
20 | .name = "hostap_cs", | ||
21 | }, | ||
22 | .attach = prism2_attach, | ||
23 | +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) | ||
24 | + .event = prism2_event, | ||
25 | +#endif | ||
26 | .detach = prism2_detach, | ||
27 | .owner = THIS_MODULE, | ||
28 | }; | ||
diff --git a/meta/packages/hostap/hostap-modules/hostap-utsname.patch b/meta/packages/hostap/hostap-modules/hostap-utsname.patch new file mode 100644 index 0000000000..c29cc8d2c9 --- /dev/null +++ b/meta/packages/hostap/hostap-modules/hostap-utsname.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap.c hostap-driver-0.3.7/driver/modules/hostap.c | ||
2 | --- hostap-driver-0.3.7.orig/driver/modules/hostap.c 2005-07-25 09:14:01.995965088 +0000 | ||
3 | +++ hostap-driver-0.3.7/driver/modules/hostap.c 2005-07-25 09:13:22.301999488 +0000 | ||
4 | @@ -25,6 +25,7 @@ | ||
5 | #include <linux/if_arp.h> | ||
6 | #include <linux/delay.h> | ||
7 | #include <linux/random.h> | ||
8 | +#include <linux/utsname.h> | ||
9 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) | ||
10 | #include <linux/tqueue.h> | ||
11 | #else | ||
12 | diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c | ||
13 | --- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:14:01.996964936 +0000 | ||
14 | +++ hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:13:22.302999336 +0000 | ||
15 | @@ -19,6 +19,7 @@ | ||
16 | #include <linux/netdevice.h> | ||
17 | #include <linux/if_ether.h> | ||
18 | #include <linux/if_arp.h> | ||
19 | +#include <linux/utsname.h> | ||
20 | #include <asm/string.h> | ||
21 | |||
22 | #include "hostap_crypt.h" | ||
23 | diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c | ||
24 | --- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:14:01.996964936 +0000 | ||
25 | +++ hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:13:22.302999336 +0000 | ||
26 | @@ -19,6 +19,7 @@ | ||
27 | #include <linux/netdevice.h> | ||
28 | #include <linux/if_ether.h> | ||
29 | #include <linux/if_arp.h> | ||
30 | +#include <linux/utsname.h> | ||
31 | #include <asm/string.h> | ||
32 | |||
33 | #include "hostap_crypt.h" | ||
34 | diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c | ||
35 | --- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c 2005-07-25 09:14:01.996964936 +0000 | ||
36 | +++ hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c 2005-07-25 09:13:22.302999336 +0000 | ||
37 | @@ -15,6 +15,7 @@ | ||
38 | #include <linux/init.h> | ||
39 | #include <linux/slab.h> | ||
40 | #include <linux/random.h> | ||
41 | +#include <linux/utsname.h> | ||
42 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) | ||
43 | #include <linux/tqueue.h> | ||
44 | #else | ||
45 | diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c hostap-driver-0.3.7/driver/modules/hostap_cs.c | ||
46 | --- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-07-25 09:14:01.997964784 +0000 | ||
47 | +++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-07-25 09:13:22.302999336 +0000 | ||
48 | @@ -12,6 +12,7 @@ | ||
49 | #include <linux/timer.h> | ||
50 | #include <linux/skbuff.h> | ||
51 | #include <linux/netdevice.h> | ||
52 | +#include <linux/utsname.h> | ||
53 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) | ||
54 | #include <linux/tqueue.h> | ||
55 | #else | ||
56 | diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c hostap-driver-0.3.7/driver/modules/hostap_pci.c | ||
57 | --- hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c 2005-07-25 09:14:01.997964784 +0000 | ||
58 | +++ hostap-driver-0.3.7/driver/modules/hostap_pci.c 2005-07-25 09:13:22.303999184 +0000 | ||
59 | @@ -11,6 +11,7 @@ | ||
60 | #include <linux/if.h> | ||
61 | #include <linux/skbuff.h> | ||
62 | #include <linux/netdevice.h> | ||
63 | +#include <linux/utsname.h> | ||
64 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) | ||
65 | #include <linux/tqueue.h> | ||
66 | #else | ||
67 | diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c hostap-driver-0.3.7/driver/modules/hostap_plx.c | ||
68 | --- hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c 2005-07-25 09:14:01.997964784 +0000 | ||
69 | +++ hostap-driver-0.3.7/driver/modules/hostap_plx.c 2005-07-25 09:13:22.303999184 +0000 | ||
70 | @@ -14,6 +14,7 @@ | ||
71 | #include <linux/if.h> | ||
72 | #include <linux/skbuff.h> | ||
73 | #include <linux/netdevice.h> | ||
74 | +#include <linux/utsname.h> | ||
75 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) | ||
76 | #include <linux/tqueue.h> | ||
77 | #else | ||
diff --git a/meta/packages/hostap/hostap-modules/hostap_cardid.patch b/meta/packages/hostap/hostap-modules/hostap_cardid.patch new file mode 100644 index 0000000000..05f716e22f --- /dev/null +++ b/meta/packages/hostap/hostap-modules/hostap_cardid.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | Index: hostap-driver-0.3.9/driver/modules/hostap_cs.c | ||
2 | =================================================================== | ||
3 | --- hostap-driver-0.3.9.orig/driver/modules/hostap_cs.c 2005-08-24 10:11:47.000000000 +0100 | ||
4 | +++ hostap-driver-0.3.9/driver/modules/hostap_cs.c 2005-08-24 10:39:10.000000000 +0100 | ||
5 | @@ -908,6 +908,57 @@ | ||
6 | return 0; | ||
7 | } | ||
8 | |||
9 | +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) | ||
10 | +static struct pcmcia_device_id hostap_cs_ids[] = { | ||
11 | + PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), | ||
12 | + PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), | ||
13 | + PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), | ||
14 | + PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), | ||
15 | + PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), | ||
16 | + PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), | ||
17 | + PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), | ||
18 | + PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), | ||
19 | + PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), | ||
20 | + PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), | ||
21 | + PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), | ||
22 | + PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), | ||
23 | + PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), | ||
24 | + PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), | ||
25 | + PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), | ||
26 | + PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), | ||
27 | + PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), | ||
28 | + PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), | ||
29 | + PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", | ||
30 | + 0x7a954bd9, 0x74be00c6), | ||
31 | + PCMCIA_DEVICE_PROD_ID1234( | ||
32 | + "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", | ||
33 | + "Eval-RevA", | ||
34 | + 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e), | ||
35 | + PCMCIA_DEVICE_PROD_ID123( | ||
36 | + "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", | ||
37 | + 0xe6ec52ce, 0x08649af2, 0x4b74baa0), | ||
38 | + PCMCIA_DEVICE_PROD_ID123( | ||
39 | + "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02", | ||
40 | + 0x71b18589, 0xb6f1b0ab, 0x4b74baa0), | ||
41 | + PCMCIA_DEVICE_PROD_ID123( | ||
42 | + "Instant Wireless ", " Network PC CARD", "Version 01.02", | ||
43 | + 0x11d901af, 0x6e9bd926, 0x4b74baa0), | ||
44 | + PCMCIA_DEVICE_PROD_ID123( | ||
45 | + "SMC", "SMC2632W", "Version 01.02", | ||
46 | + 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0), | ||
47 | + PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card", | ||
48 | + 0x54f7c49c, 0x15a75e5b), | ||
49 | + PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", | ||
50 | + 0x74c5e40d, 0xdb472a18), | ||
51 | + PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card", | ||
52 | + 0x0733cc81, 0x0c52f395), | ||
53 | + PCMCIA_DEVICE_PROD_ID12( | ||
54 | + "ZoomAir 11Mbps High", "Rate wireless Networking", | ||
55 | + 0x273fe3db, 0x32a1eaee), | ||
56 | + PCMCIA_DEVICE_NULL | ||
57 | +}; | ||
58 | +MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids); | ||
59 | +#endif | ||
60 | |||
61 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67) | ||
62 | static struct pcmcia_driver hostap_driver = { | ||
63 | @@ -917,6 +968,7 @@ | ||
64 | .attach = prism2_attach, | ||
65 | #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) | ||
66 | .event = prism2_event, | ||
67 | + .id_table = hostap_cs_ids, | ||
68 | #endif | ||
69 | .detach = prism2_detach, | ||
70 | .owner = THIS_MODULE, | ||
diff --git a/meta/packages/hostap/hostap-modules/ipaq_compat.patch b/meta/packages/hostap/hostap-modules/ipaq_compat.patch new file mode 100644 index 0000000000..b139ef38f1 --- /dev/null +++ b/meta/packages/hostap/hostap-modules/ipaq_compat.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old 2005-04-17 09:12:38.304421464 +0100 | ||
2 | +++ hostap-driver-0.3.7/driver/modules/hostap_compat.h 2005-04-17 09:13:04.413452288 +0100 | ||
3 | @@ -5,7 +5,7 @@ | ||
4 | #define NEW_MODULE_CODE | ||
5 | #endif | ||
6 | |||
7 | -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) | ||
8 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD) | ||
9 | |||
10 | #define HOSTAP_QUEUE struct tq_struct | ||
11 | |||
diff --git a/meta/packages/hostap/hostap-modules/kernel_updates.patch b/meta/packages/hostap/hostap-modules/kernel_updates.patch new file mode 100644 index 0000000000..70487a96f8 --- /dev/null +++ b/meta/packages/hostap/hostap-modules/kernel_updates.patch | |||
@@ -0,0 +1,192 @@ | |||
1 | Index: hostap-driver-0.4.4/driver/modules/hostap_cs.c | ||
2 | =================================================================== | ||
3 | --- hostap-driver-0.4.4.orig/driver/modules/hostap_cs.c 2005-08-21 20:23:21.000000000 +0100 | ||
4 | +++ hostap-driver-0.4.4/driver/modules/hostap_cs.c 2005-09-17 17:09:05.000000000 +0100 | ||
5 | @@ -207,12 +207,17 @@ | ||
6 | #include "hostap_hw.c" | ||
7 | |||
8 | |||
9 | - | ||
10 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
11 | static void prism2_detach(dev_link_t *link); | ||
12 | +#else | ||
13 | +static void prism2_detach(struct pcmcia_device *p_dev); | ||
14 | +#endif | ||
15 | + | ||
16 | static void prism2_release(u_long arg); | ||
17 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
18 | static int prism2_event(event_t event, int priority, | ||
19 | event_callback_args_t *args); | ||
20 | - | ||
21 | +#endif | ||
22 | |||
23 | static int prism2_pccard_card_present(local_info_t *local) | ||
24 | { | ||
25 | @@ -508,25 +513,36 @@ | ||
26 | } | ||
27 | #endif | ||
28 | |||
29 | +static int prism2_config(dev_link_t *link); | ||
30 | |||
31 | /* allocate local data and register with CardServices | ||
32 | * initialize dev_link structure, but do not configure the card yet */ | ||
33 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
34 | static dev_link_t *prism2_attach(void) | ||
35 | +#else | ||
36 | +static int prism2_attach(struct pcmcia_device *p_dev) | ||
37 | +#endif | ||
38 | { | ||
39 | dev_link_t *link; | ||
40 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
41 | client_reg_t client_reg; | ||
42 | int ret; | ||
43 | +#endif | ||
44 | |||
45 | link = kmalloc(sizeof(dev_link_t), GFP_KERNEL); | ||
46 | if (link == NULL) | ||
47 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
48 | return NULL; | ||
49 | - | ||
50 | +#else | ||
51 | + return -ENOMEM; | ||
52 | +#endif | ||
53 | memset(link, 0, sizeof(dev_link_t)); | ||
54 | |||
55 | PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info); | ||
56 | link->conf.Vcc = 33; | ||
57 | link->conf.IntType = INT_MEMORY_AND_IO; | ||
58 | |||
59 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
60 | /* register with CardServices */ | ||
61 | link->next = dev_list; | ||
62 | dev_list = link; | ||
63 | @@ -547,12 +563,28 @@ | ||
64 | prism2_detach(link); | ||
65 | return NULL; | ||
66 | } | ||
67 | + | ||
68 | return link; | ||
69 | -} | ||
70 | +#else | ||
71 | + link->handle = p_dev; | ||
72 | + p_dev->instance = link; | ||
73 | + | ||
74 | + link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; | ||
75 | + prism2_config(link); | ||
76 | |||
77 | + return 0; | ||
78 | +#endif | ||
79 | +} | ||
80 | |||
81 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
82 | static void prism2_detach(dev_link_t *link) | ||
83 | +#else | ||
84 | +static void prism2_detach(struct pcmcia_device *p_dev) | ||
85 | +#endif | ||
86 | { | ||
87 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) | ||
88 | + dev_link_t *link = dev_to_instance(p_dev); | ||
89 | +#endif | ||
90 | dev_link_t **linkp; | ||
91 | |||
92 | PDEBUG(DEBUG_FLOW, "prism2_detach\n"); | ||
93 | @@ -570,6 +602,7 @@ | ||
94 | prism2_release((u_long)link); | ||
95 | } | ||
96 | |||
97 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
98 | if (link->handle) { | ||
99 | int res = pcmcia_deregister_client(link->handle); | ||
100 | if (res) { | ||
101 | @@ -577,6 +610,7 @@ | ||
102 | cs_error(link->handle, DeregisterClient, res); | ||
103 | } | ||
104 | } | ||
105 | +#endif | ||
106 | |||
107 | *linkp = link->next; | ||
108 | /* release net devices */ | ||
109 | @@ -855,7 +889,53 @@ | ||
110 | PDEBUG(DEBUG_FLOW, "release - done\n"); | ||
111 | } | ||
112 | |||
113 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) | ||
114 | +static int prism2_suspend1(struct pcmcia_device *dev) | ||
115 | +{ | ||
116 | + dev_link_t *link = dev_to_instance(dev); | ||
117 | + struct net_device *ndev = (struct net_device *) link->priv; | ||
118 | + | ||
119 | + PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info); | ||
120 | + link->state |= DEV_SUSPEND; | ||
121 | + /* fall through */ | ||
122 | |||
123 | + if (link->state & DEV_CONFIG) { | ||
124 | + if (link->open) { | ||
125 | + netif_stop_queue(ndev); | ||
126 | + netif_device_detach(ndev); | ||
127 | + } | ||
128 | + prism2_suspend(ndev); | ||
129 | + pcmcia_release_configuration(link->handle); | ||
130 | + } | ||
131 | + | ||
132 | + return 0; | ||
133 | +} | ||
134 | + | ||
135 | +static int prism2_resume1(struct pcmcia_device *dev) | ||
136 | +{ | ||
137 | + dev_link_t *link = dev_to_instance(dev); | ||
138 | + struct net_device *ndev = (struct net_device *) link->priv; | ||
139 | + | ||
140 | + PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info); | ||
141 | + | ||
142 | + link->state &= ~DEV_SUSPEND; | ||
143 | + /* fall through */ | ||
144 | + | ||
145 | + if (link->state & DEV_CONFIG) { | ||
146 | + pcmcia_request_configuration(link->handle, &link->conf); | ||
147 | + prism2_hw_shutdown(ndev, 1); | ||
148 | + prism2_hw_config(ndev, link->open ? 0 : 1); | ||
149 | + if (link->open) { | ||
150 | + netif_device_attach(ndev); | ||
151 | + netif_start_queue(ndev); | ||
152 | + } | ||
153 | + } | ||
154 | + | ||
155 | + return 0; | ||
156 | +} | ||
157 | +#endif | ||
158 | + | ||
159 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
160 | static int prism2_event(event_t event, int priority, | ||
161 | event_callback_args_t *args) | ||
162 | { | ||
163 | @@ -924,7 +1004,7 @@ | ||
164 | } | ||
165 | return 0; | ||
166 | } | ||
167 | - | ||
168 | +#endif | ||
169 | |||
170 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67) | ||
171 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)) | ||
172 | @@ -983,11 +1063,20 @@ | ||
173 | .drv = { | ||
174 | .name = "hostap_cs", | ||
175 | }, | ||
176 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) | ||
177 | + .probe = prism2_attach, | ||
178 | + .remove = prism2_detach, | ||
179 | + .suspend = prism2_suspend1, | ||
180 | + .resume = prism2_resume1, | ||
181 | +#else | ||
182 | .attach = prism2_attach, | ||
183 | .detach = prism2_detach, | ||
184 | +#endif | ||
185 | .owner = THIS_MODULE, | ||
186 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)) | ||
187 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) | ||
188 | .event = prism2_event, | ||
189 | +#endif | ||
190 | .id_table = hostap_cs_ids, | ||
191 | #endif | ||
192 | }; | ||
diff --git a/meta/packages/hostap/hostap-modules/mtx_compat.diff b/meta/packages/hostap/hostap-modules/mtx_compat.diff new file mode 100644 index 0000000000..c2d6662d69 --- /dev/null +++ b/meta/packages/hostap/hostap-modules/mtx_compat.diff | |||
@@ -0,0 +1,20 @@ | |||
1 | --- driver/modules/hostap_compat.h.orig 2004-08-09 16:16:48.359929856 +0200 | ||
2 | +++ driver/modules/hostap_compat.h 2004-08-09 16:17:12.383277752 +0200 | ||
3 | @@ -13,7 +13,7 @@ | ||
4 | MOD_INC_USE_COUNT; \ | ||
5 | if (schedule_task((q)) == 0) \ | ||
6 | MOD_DEC_USE_COUNT; | ||
7 | - | ||
8 | +/* | ||
9 | static inline void flush_scheduled_work(void) | ||
10 | { | ||
11 | flush_scheduled_tasks(); | ||
12 | @@ -27,7 +27,7 @@ | ||
13 | tq->routine = routine; | ||
14 | tq->data = data; | ||
15 | } | ||
16 | - | ||
17 | +*/ | ||
18 | #else /* kernel < 2.5.44 */ | ||
19 | |||
20 | #define HOSTAP_QUEUE struct work_struct | ||
diff --git a/meta/packages/hostap/hostap-modules/mtx_hostap_deferred_irq.diff b/meta/packages/hostap/hostap-modules/mtx_hostap_deferred_irq.diff new file mode 100644 index 0000000000..e979b72d93 --- /dev/null +++ b/meta/packages/hostap/hostap-modules/mtx_hostap_deferred_irq.diff | |||
@@ -0,0 +1,81 @@ | |||
1 | --- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100 | ||
2 | +++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100 | ||
3 | @@ -50,6 +50,13 @@ | ||
4 | }; | ||
5 | |||
6 | |||
7 | +#define DEFERRED_IRQ_INITIALIZATION | ||
8 | + | ||
9 | +#ifdef DEFERRED_IRQ_INITIALIZATION | ||
10 | +struct net_device *devb[MAX_PARM_DEVICES]; | ||
11 | +#endif | ||
12 | + | ||
13 | + | ||
14 | #ifdef PRISM2_IO_DEBUG | ||
15 | |||
16 | static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v) | ||
17 | @@ -280,6 +287,10 @@ | ||
18 | |||
19 | pci_set_drvdata(pdev, dev); | ||
20 | |||
21 | +#ifdef DEFERRED_IRQ_INITIALIZATION | ||
22 | + printk("%s: deferred initialization of IRQs\n", dev_info); | ||
23 | + devb[cards_found-1] = dev; | ||
24 | +#else | ||
25 | if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name, | ||
26 | dev)) { | ||
27 | printk(KERN_WARNING "%s: request_irq failed\n", dev->name); | ||
28 | @@ -295,7 +306,7 @@ | ||
29 | |||
30 | printk(KERN_INFO "%s: Intersil Prism2.5 PCI: " | ||
31 | "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq); | ||
32 | - | ||
33 | +#endif | ||
34 | return hostap_hw_ready(dev); | ||
35 | |||
36 | fail: | ||
37 | @@ -399,18 +410,43 @@ | ||
38 | }; | ||
39 | |||
40 | |||
41 | +#ifdef DEFERRED_IRQ_INITIALIZATION | ||
42 | +static void deferred_init(int num_devices) | ||
43 | +{ | ||
44 | + int n; | ||
45 | + for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++) | ||
46 | + { | ||
47 | + if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name, | ||
48 | + devb[n])) { | ||
49 | + printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name); | ||
50 | + } | ||
51 | + if (prism2_hw_config(devb[n], 1)) { | ||
52 | + printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name) | ||
53 | +; | ||
54 | + } | ||
55 | + printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]-> | ||
56 | +irq); | ||
57 | + } | ||
58 | +} | ||
59 | +#endif | ||
60 | + | ||
61 | static int __init init_prism2_pci(void) | ||
62 | { | ||
63 | printk(KERN_INFO "%s: %s\n", dev_info, version); | ||
64 | |||
65 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) | ||
66 | - if (pci_register_driver(&prism2_pci_drv_id) <= 0) { | ||
67 | + int n; | ||
68 | + if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) { | ||
69 | printk("hostap_pci: No devices found, driver not " | ||
70 | "installed.\n"); | ||
71 | pci_unregister_driver(&prism2_pci_drv_id); | ||
72 | return -ENODEV; | ||
73 | } | ||
74 | |||
75 | +#ifdef DEFERRED_IRQ_INITIALIZATION | ||
76 | + deferred_init(n); | ||
77 | +#endif | ||
78 | + | ||
79 | return 0; | ||
80 | #else | ||
81 | return pci_register_driver(&prism2_pci_drv_id); | ||
diff --git a/meta/packages/hostap/hostap-modules_0.3.9.bb b/meta/packages/hostap/hostap-modules_0.3.9.bb new file mode 100644 index 0000000000..cc09fd5952 --- /dev/null +++ b/meta/packages/hostap/hostap-modules_0.3.9.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | include hostap-modules.inc | ||
2 | PR = "r10" | ||
3 | |||
4 | SRC_URI += "file://Makefile.patch;patch=1 \ | ||
5 | file://add_event.patch;patch=1 \ | ||
6 | file://hostap-utsname.patch;patch=1 \ | ||
7 | file://hostap_cardid.patch;patch=1" | ||
diff --git a/meta/packages/hostap/hostap-utils.inc b/meta/packages/hostap/hostap-utils.inc new file mode 100644 index 0000000000..1e4362d0f7 --- /dev/null +++ b/meta/packages/hostap/hostap-utils.inc | |||
@@ -0,0 +1,24 @@ | |||
1 | DESCRIPTION = "User mode helpers for the hostap driver" | ||
2 | HOMEPAGE = "http://hostap.epitest.fi" | ||
3 | SECTION = "kernel/userland" | ||
4 | PRIORITY = "optional" | ||
5 | MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" | ||
6 | LICENSE = "GPL" | ||
7 | RRECOMMENDS = "hostap-modules" | ||
8 | PR = "r3" | ||
9 | |||
10 | SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ | ||
11 | file://hostap-fw-load.patch;patch=1" | ||
12 | S = "${WORKDIR}/hostap-utils-${PV}" | ||
13 | |||
14 | BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \ | ||
15 | hostap_rid prism2_param prism2_srec split_combined_hex" | ||
16 | |||
17 | do_install() { | ||
18 | install -d ${D}${sbindir}/ | ||
19 | for f in ${BINARIES} | ||
20 | do | ||
21 | install -m 0755 $f ${D}${sbindir}/ | ||
22 | done | ||
23 | } | ||
24 | |||
diff --git a/meta/packages/hostap/hostap-utils_0.3.7.bb b/meta/packages/hostap/hostap-utils_0.3.7.bb new file mode 100644 index 0000000000..ad06cd3d6d --- /dev/null +++ b/meta/packages/hostap/hostap-utils_0.3.7.bb | |||
@@ -0,0 +1,3 @@ | |||
1 | include hostap-utils.inc | ||
2 | |||
3 | PR = "r3" | ||
diff --git a/meta/packages/hostap/hostap-utils_0.4.0.bb b/meta/packages/hostap/hostap-utils_0.4.0.bb new file mode 100644 index 0000000000..ad06cd3d6d --- /dev/null +++ b/meta/packages/hostap/hostap-utils_0.4.0.bb | |||
@@ -0,0 +1,3 @@ | |||
1 | include hostap-utils.inc | ||
2 | |||
3 | PR = "r3" | ||