diff options
| author |   Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/hostap | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
| download | openembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/hostap')
31 files changed, 1438 insertions, 0 deletions
diff --git a/recipes/hostap/files/hostap-fw-load.patch b/recipes/hostap/files/hostap-fw-load.patch new file mode 100644 index 0000000000..c9fe9360b0 --- /dev/null +++ b/recipes/hostap/files/hostap-fw-load.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- hostap-utils-0.2.4/hostap_fw_load~hostap-fw-load ++++ hostap-utils-0.2.4/hostap_fw_load +@@ -6,9 +6,9 @@ + # Firmware images for the card + # TODO: could try to select correct firmware type automatically + +-PRI=/etc/pcmcia/PM010102.HEX +-STA=/etc/pcmcia/RF010802.HEX +-PRISM2_SREC=/usr/local/bin/prism2_srec ++PRI=/lib/firmware/pm010102.hex ++STA=/lib/firmware/rf010704.hex ++PRISM2_SREC=/usr/sbin/prism2_srec + + set -e + diff --git a/recipes/hostap/files/hostap_cs.conf b/recipes/hostap/files/hostap_cs.conf new file mode 100644 index 0000000000..8dda82aad3 --- /dev/null +++ b/recipes/hostap/files/hostap_cs.conf @@ -0,0 +1,193 @@ +module "hostap_cs" opts "channel=3 iw_mode=2 essid=any ignore_cis_vcc=1" + +card "Actiontec 802CI2" + manfid 0x1668, 0x0101 + bind "hostap_cs" + +card "AirWay 802.11 Adapter (PCMCIA)" + #version "AirWay", "802.11 Adapter (PCMCIA)" + manfid 0x0261, 0x0002 + bind "hostap_cs" + +card "Asus SpaceLink WL110" + manfid 0x02aa,0x0002 + bind "hostap_cs" + +## handhelds.org bug 964 +card "Belkin F5D6060 Ethernet" + #version "PCMCIA", "11M WLAN Card v2.5", "ISL37300P", "RevA" + manfid 0x0274, 0x1612 + bind "hostap_cs" + +card "Compaq 11Mbps Wireless PC Card" + manfid 0x028a, 0x0002 + bind "hostap_cs" + +card "Compaq WL100 11 Mbps Wireless Adapter" + manfid 0x0138, 0x0002 + bind "hostap_cs" + +card "Compaq HNW-100 11 Mbps Wireless Adapter" + manfid 0x028a, 0x0002 + bind "hostap_cs" + +card "D-Link DWL-650" + version "D", "Link DWL-650 11Mbps WLAN Card" + bind "hostap_cs" + +card "D-Link DRC-650" + version "D", "Link DRC-650 11Mbps WLAN Card" + bind "hostap_cs" + +card "D-Link DCF660" + manfid 0xd601, 0x0005 + bind "hostap_cs" + +card "Farallon SkyLINE" + version "INTERSIL", "HFA384x/IEEE" + bind "hostap_cs" + +card "HyperLink Wireless PC Card 11Mbps" + version "HyperLink", "Wireless PC Card 11Mbps" + bind "hostap_cs" + +# card "Intersil PRISM2 11 Mbps Wireless Adapter" +# manfid 0x0156, 0x0002 +# bind "hostap_cs" + +card "LA4111 Spectrum24 Wireless LAN PC Card" + version "Symbol Technologies" + bind "hostap_cs" + +card "Linksys WPC11 11Mbps 802.11b WLAN Card" + version "Instant Wireless ", " Network PC CARD", "Version 01.02" + bind "hostap_cs" + +card "Linksys WCF11 11Mbps 802.11b WLAN Card" + manfid 0x0274, 0x3301 + bind "hostap_cs" + +## handhelds.org bug #790 +card "Linksys Wireless CompactFlash Card WCF12" + manfid 0x028a, 0x0673 + bind "hostap_cs" + +card "Linksys WLAN CF Card" + manfid 0x0274, 0x3301 + bind "hostap_cs" + +card "NETGEAR MA701 Wireless CF Card" + manfid 0xd601, 0x0002 + bind "hostap_cs" + +card "Nortel Networks eMobility 802.11 Wireless Adapter" + manfid 0x01eb, 0x080a + bind "hostap_cs" + +card "PLANEX GeoWave GW-CF110" + version "PLANEX", "GeoWave/GW-CF110" + bind "hostap_cs" + +card "PROXIM LAN PC CARD HARMONY 80211B" + version "PROXIM", "LAN PC CARD HARMONY 80211B" + bind "hostap_cs" + +card "Proxim RangeLAN/DS" + version "PROXIM","RangeLAN-DS/LAN PC CARD" + manfid 0x0126, 0x8000 + bind "hostap_cs" + +card "Safeway 802.11b Wireless Adapter" + manfid 0xd601, 0x0002 + bind "hostap_cs" + +card "SAMSUNG 11Mbps WLAN Card" + version "SAMSUNG", "11Mbps WLAN Card" + bind "hostap_cs" + +# needs firmware upload via hostap_fw_load +card "SanDisk ConnectPlus OEM (0MB)" + manfid 0xd601, 0x0010 + bind "hostap_cs" + +# needs special activation (>=hostap 0.3.2 only) plus firmware upload +card "SanDisk ConnectPlus w/ Memory" + version "SanDisk", "ConnectPlus" + manfid 0xd601, 0x0101 + bind "hostap_cs" to 0 +# bind "ide-cs" to 1 + +card "Senao/Origo 80211b WLAN Card" + manfid 0x000b,0x7100 + bind "hostap_cs" + +card "Sitecom WL-007 WLAN CF Card" + manfid 0xd601, 0x0004 + bind "hostap_cs" + +card "SMC2632 802.11 (prism2) Card" + version "SMC", "SMC2632W", "Version 01.02", "" + bind "hostap_cs" + +card "SpeedStream SS1021 Wireless Adapter" + #version "Siemens", "SpeedStream Wireless PCMCIA" + manfid 0x02ac, 0x0002 + bind "hostap_cs" + +card "ZCOMAX AirRunner/XI-300" + #version "ZCOMAX", "AirRunner/XI-300" + manfid 0xd601, 0x0002 + bind "hostap_cs" + +card "Zonet ZCF1100" + manfid 0x000b, 0x7100 + bind "hostap_cs" + +card "Wireless LAN Adapter Version 01.02" + version "Wireless", "LAN Adapter", "Version 01.02" +# manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "Ambicom WL1100C 11Mbs Card 802.11b" + version "AmbiCom", "WL1100C 802.11b CF-Card", "2.2" + manfid 0xd601,0x0002 + bind "hostap_cs" + +card "Ambicom WL1100C 11Mbs Card 802.11b" + manfid 0xd601,0x0002 + bind "hostap_cs" + +card "Sandisk Connect SDWCFB-000" + manfid 0xd601,0x0005 + bind "hostap_cs" + +# Cards with Intersil firmware (Prism chipset) + +card "Linksys WPC11 11Mbps 802.11b WLAN Card" + version "The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", "RevA" + bind "hostap_cs" + +card "Linksys CompactFlash Wireless Card" + version "Linksys", "Wireless CompactFlash Card" + bind "hostap_cs" + +card "ACTIONTEC PRISM Wireless LAN PC Card" + version "ACTIONTEC", "PRISM Wireless LAN PC Card" + bind "hostap_cs" + +card "Linksys WPC11 Version 3" + manfid 0x0274,0x1613 + bind "hostap_cs" + +card "BENQ AWL100" + version "BENQ", "AWL100 PCMCIA ADAPTER" + bind "hostap_cs" + +card "Pretec WLAN" + version "Pretec", "CompactWLAN Card 802.11b", "2.5" + manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "TrendNet TEW PC16" + manfid 0x0274, 0x1601 + bind "hostap_cs" diff --git a/recipes/hostap/files/hostap_cs.conf-upstream b/recipes/hostap/files/hostap_cs.conf-upstream new file mode 100644 index 0000000000..5b7385a7cb --- /dev/null +++ b/recipes/hostap/files/hostap_cs.conf-upstream @@ -0,0 +1,191 @@ +device "hostap_cs" + class "network" module "hostap", "hostap_cs" + +card "Intersil PRISM2 Reference Design 11Mb/s WLAN Card" + version "INTERSIL", "HFA384x/IEEE" + bind "hostap_cs" + +card "Compaq WL100 11Mb/s WLAN Card" + manfid 0x0138, 0x0002 + bind "hostap_cs" + +card "Compaq WL200" + version "Compaq", "WL200_11Mbps_Wireless_PCI_Card" + bind "hostap_cs" + +card "EMTAC A2424i 11Mbps WLAN Card" + manfid 0xc250, 0x0002 +# cis "cis/Emtac.dat" + bind "hostap_cs" + +card "Linksys WPC11 11Mbps WLAN Card" + version "Instant Wireless ", " Network PC CARD", "Version 01.02" + bind "hostap_cs" + +card "Linksys WPC11 Ver 2.5 11Mbps WLAN Card" + manfid 0x0274, 0x1612 + bind "hostap_cs" + +card "Linksys WPC11 Ver 3 11Mbps WLAN Card" + manfid 0x0274, 0x1613 + bind "hostap_cs" + +card "Linksys WCF12 Wireless CompactFlash Card" + version "Linksys", "Wireless CompactFlash Card" + bind "hostap_cs" + +card "D-Link DWL-650 11Mbps WLAN Card" + version "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02" + bind "hostap_cs" + +card "D-Link DRC-650 11Mbps WLAN Card" +# version "D", "Link DRC-650 11Mbps WLAN Card", "Version 01.02" + manfid 0x028a, 0x0002 + bind "hostap_cs" + +card "ZoomAir 4100 11Mb/s WLAN Card" + version "ZoomAir 11Mbps High", "Rate wireless Networking" + bind "hostap_cs" + +card "Addtron AWP-100 11Mbps WLAN Card" + version "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02" + bind "hostap_cs" + +card "Samsung SWL2000-N 11Mb/s WLAN Card" + manfid 0x0250, 0x0002 + bind "hostap_cs" + +card "SMC 2632W 11Mbps WLAN Card" + version "SMC", "SMC2632W", "Version 01.02" + bind "hostap_cs" + +card "BroMax Freeport 11Mbps WLAN Card" + version "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA" + bind "hostap_cs" + +card "Z-Com XI300 11Mb/s WLAN Card" + manfid 0xd601, 0x0002 + bind "hostap_cs" + +card "Zcomax XI-325H 200mW" +# version " ", "IEEE 802.11 Wireless LAN/PC Card" + manfid 0xd601, 0x0005 + bind "hostap_cs" + +card "3Com AirConnect PCI 777A" + manfid 0x0101, 0x0777 + bind "hostap_cs" + +card "U.S. Robotics IEEE 802.11b PC-CARD" + version "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02" +# manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "Longshine LCR-8531 11Mbps WLAN PCMCIA CARD" + version "OEM", "PRISM2 IEEE 802.11 PC-Card", "Version 01.02" +# manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "Philips 802.11b WLAN PCMCIA" + manfid 0x000b, 0x7300 + bind "hostap_cs" + +card "Proxim RangeLAN" +# version "PROXIM", "RangeLAN-DS/LAN PC CARD" + manfid 0x0126, 0x8000 + bind "hostap_cs" + +card "Buffalo WLI-CF-S11G" + version "BUFFALO", "WLI-CF-S11G" +# manfid 0x026f, 0x030b + bind "hostap_cs" + +card "Level-One WPC-0100" + version "Digital Data Communications", "WPC-0100", "Version 00.00" + manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "Belkin 802.11b WLAN PCMCIA" + version "Belkin", "11Mbps Wireless Notebook Network Adapter", "Version 01.02" + manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "Senao SL-2011CD/SL-2011CDPLUS" + version "INTERSIL", "HFA384x/IEEE", "Version 01.02" + manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "Fulbond Airbond XI-300B" + version " ", "IEEE 802.11 Wireless LAN/PC Card" + manfid 0xd601, 0x0002 + bind "hostap_cs" + +card "Netgear MA401" + version "NETGEAR MA401 Wireless PC", "Card", "Version 01.00" +# manfid 0x0156, 0x0002 + bind "hostap_cs" + +card "D-Link DWL-650 Rev. P1" + version "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10", "A3" +# manfid 0x000b, 0x7110 + bind "hostap_cs" + +card "SonicWALL Long Range Wireless Card" + version "SonicWALL", "Long Range Wireless Card", "ISL37100P", "1.0" + manfid 0x000b, 0x7100 + bind "hostap_cs" + +card "Senao NL-2011CD PLUS Ext2 Mercury" + version "WLAN", "11Mbps_PC-Card_3.0", "ISL37100P", "Eval-RevA" + manfid 0x000b, 0x7100 + bind "hostap_cs" + +card "Airvast WL100" + version "AIRVAST", "IEEE 802.11b Wireless PCMCIA Card", "HFA3863" + manfid 0x50c2, 0x0001 + bind "hostap_cs" + +card "Microsoft Wireless Notebook Adapter MN-520 1.0.3" + version "Microsoft", "Wireless Notebook Adapter MN-520", "", "1.0.3" + manfid 0x02d2, 0x0001 + bind "hostap_cs" + +card "NETGEAR MA401RA" + version "NETGEAR MA401RA Wireless PC", "Card", "ISL37300P", "Eval-RevA" + manfid 0x000b, 0x7300 + bind "hostap_cs" + +card "Allied Telesyn AT-WCL452" + version "Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", "Ver. 1.00" + manfid 0xc00f, 0x0000 + bind "hostap_cs" + +card "corega WL PCCL-11" + version "corega", "WL PCCL-11", "ISL37300P", "RevA" + manfid 0xc00f, 0x0000 + bind "hostap_cs" + +card "SanDisk ConnectPlus" + version "SanDisk", "ConnectPlus" + manfid 0xd601, 0x0101 + bind "hostap_cs" to 0 + bind "ide-cs" to 1 + +card "ASUS WL-100 8011b WLAN PC Card" + version "ASUS", "802_11b_PC_CARD_25", "Version 01.00" + manfid 0x02aa, 0x0002 + bind "hostap_cs" + +card "ZyXel Zyair B-101 802.11b WLAN card" + version " ", "IEEE 802.11 Wireless LAN/PC Card" + manfid 0xd601, 0x0010 + bind "hostap_cs" + +card "WLAN PRISM PCMCIA CARD 37300P RevB6" + version "WLAN", "PRISM PCMCIA CARD", "37300P", "Revision B6" + manfid 0x50c2, 0x7300 + bind "hostap_cs" + + +# Optional configuration parameters for hostap_cs.o +# module "hostap_cs" opts "channel=3 iw_mode=3 essid=test ignore_cis_vcc=0" diff --git a/recipes/hostap/files/hostap_cs.modalias b/recipes/hostap/files/hostap_cs.modalias new file mode 100644 index 0000000000..cb9efab271 --- /dev/null +++ b/recipes/hostap/files/hostap_cs.modalias @@ -0,0 +1,28 @@ +# product info: "Pretec", "CompactWLAN Card 802.11b", "2.5" +pcmcia:m0156c0002f06fn00pfn00pa1CADD3E5pbE697636Cpc7A5BFCF1pd00000000 hostap_cs + +# manufacturer ID which exist in orinoco_cs AND in hostap_cs +pcmcia:m000Bc7100f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m000Bc7300f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m0126c8000f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m0138c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m0250c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m0274c1612f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m0274c1613f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m028Ac0002f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m02AAc0002f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:m50C2c7300f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:mD601c0002f06fn00pfn00pa*pb*pc*pd* hostap_cs +pcmcia:mD601c0005f06fn00pfn00pa*pb*pc*pd* hostap_cs + +# product info: "Linksys", "Wireless CompactFlash Card", "", "" +pcmcia:m028Ac0673f06fn00pfn00pa0733CC81pb0C52F395pc00000000pd00000000 hostap_cs + +# product info:"PLANEX COMMUNICATION INC","PLANEX GW-CF11X Wireless CF Card", "", "" +pcmcia:mD601c0010f06fn00pfn00pa4703CF68pbFAD7318Dpc00000000pd00000000 hostap_cs + +# 0x0156, 0x0002 and "Version 01.02" only appear for Prism based cards. +pcmcia:m0156c0002f06fn00pfn00pa*pb*pc4B74BAA0pd00000000 hostap_cs + +# "BUFFALO", "WLI-CF-S11G", "", "" +pcmcia:m026Fc030Bf06fn00pfn00pa2DECECE3pb82067C18pc00000000pd00000000 hostap_cs diff --git a/recipes/hostap/hostap-conf_1.0.bb b/recipes/hostap/hostap-conf_1.0.bb new file mode 100644 index 0000000000..e0909dde3f --- /dev/null +++ b/recipes/hostap/hostap-conf_1.0.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "PCMCIA-cs configuration files for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" +SECTION = "kernel/modules" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "update-modules" +PACKAGE_ARCH = "all" +PR = "r9" + +SRC_URI = "file://hostap_cs.conf \ + file://hostap_cs.modalias \ + file://hostap_cs.conf-upstream" + +do_compile() { +} + +do_install() { + install -d ${D}${sysconfdir}/pcmcia + install -d ${D}${sysconfdir}/modutils + + install -m 0644 ${WORKDIR}/hostap_cs.conf-upstream ${D}${sysconfdir}/pcmcia/hostap_cs.conf + cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf + + install -m 0644 ${WORKDIR}/hostap_cs.modalias ${D}${sysconfdir}/modutils/hostap_cs.conf +} + +pkg_postinst () { + if [ -n "$D" ]; then + exit 1 + fi + update-modules || true +} + +pkg_postrm () { + update-modules || true +} diff --git a/recipes/hostap/hostap-daemon-0.5.10/makefile-cross.diff b/recipes/hostap/hostap-daemon-0.5.10/makefile-cross.diff new file mode 100644 index 0000000000..43b275c67b --- /dev/null +++ b/recipes/hostap/hostap-daemon-0.5.10/makefile-cross.diff @@ -0,0 +1,31 @@ +diff -urN hostapd-0.5.10.orig/Makefile hostapd-0.5.10/Makefile +--- hostapd-0.5.10.orig/Makefile 2008-02-20 01:08:54.000000000 +0100 ++++ hostapd-0.5.10/Makefile 2008-04-28 17:01:36.000000000 +0200 +@@ -1,10 +1,14 @@ ++ifndef CC + CC=gcc ++endif + DIR_WPA_SUPPLICANT=. + + ifndef CFLAGS + CFLAGS = -MMD -O2 -Wall -g + endif + ++TARGET_PREFIX ?= /usr/local/bin/ ++ + # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to + # a file (undefine it, if you want to save in binary size) + CFLAGS += -DHOSTAPD_DUMP_STATE +@@ -333,10 +337,10 @@ + fi + + install: all +- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done ++ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done + + hostapd: $(OBJS) +- $(CC) -o hostapd $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) + + driver_conf.c: Makefile .config + rm -f driver_conf.c diff --git a/recipes/hostap/hostap-daemon.inc b/recipes/hostap/hostap-daemon.inc new file mode 100644 index 0000000000..f723d07575 --- /dev/null +++ b/recipes/hostap/hostap-daemon.inc @@ -0,0 +1,35 @@ +DESCRIPTION = "User space daemon for extended IEEE 802.11 management" +HOMEPAGE = "http://hostap.epitest.fi" +SECTION = "kernel/userland" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "hostap-utils (${PV})" +DEPENDS = "openssl" +DEPENDS_append_mtx-1 = " madwifi-modules" +DEPENDS_append_mtx-2 = " madwifi-modules" +CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/" +CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/" + +SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ + file://makefile-cross.diff;patch=1;pnum=0 \ + file://madwifi-bsd-fix.diff;patch=1;pnum=0 \ + file://defconfig \ + file://init" + +S = "${WORKDIR}/hostapd-${PV}" + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config +} + +do_compile() { + CFLAGS='${CFLAGS}' CC='${CC}' make +} + +do_install() { + install -d ${D}${sbindir} ${D}${sysconfdir}/init.d + make TARGET_PREFIX=${D}${sbindir} install + install -m 0644 hostapd.conf ${D}${sysconfdir} + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd +} + diff --git a/recipes/hostap/hostap-daemon/defconfig b/recipes/hostap/hostap-daemon/defconfig new file mode 100644 index 0000000000..d0e22f2586 --- /dev/null +++ b/recipes/hostap/hostap-daemon/defconfig @@ -0,0 +1,66 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +#CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# Integrated EAP authenticator +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP authenticator +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP authenticator +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP authenticator +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP authenticator +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP authenticator +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP authenticator +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP authenticator +#CONFIG_EAP_SIM=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# authenticator from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y diff --git a/recipes/hostap/hostap-daemon/init b/recipes/hostap/hostap-daemon/init new file mode 100644 index 0000000000..79f74b681e --- /dev/null +++ b/recipes/hostap/hostap-daemon/init @@ -0,0 +1,37 @@ +#!/bin/sh +DAEMON=/usr/sbin/hostapd +NAME=hostapd +DESC="HOSTAP Daemon" +ARGS="/etc/hostapd.conf -B" + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon -S -x $DAEMON -- $ARGS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon -K -x $DAEMON + echo "$NAME." + ;; + restart) + $0 stop + $0 start + ;; + reload) + echo -n "Reloading $DESC: " + killall -HUP $(basename ${DAEMON}) + echo "$NAME." + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/hostap/hostap-daemon/madwifi-bsd-fix.diff b/recipes/hostap/hostap-daemon/madwifi-bsd-fix.diff new file mode 100644 index 0000000000..d9dab26a15 --- /dev/null +++ b/recipes/hostap/hostap-daemon/madwifi-bsd-fix.diff @@ -0,0 +1,12 @@ +--- driver_madwifi.c.orig 2005-03-18 15:12:53.392793216 +0100 ++++ driver_madwifi.c 2005-03-18 15:13:09.246383104 +0100 +@@ -21,7 +21,8 @@ + #include <sys/types.h> + #include <sys/socket.h> + +-#include <include/compat.h> ++#include <net80211/compat.h> ++#include <net80211/_ieee80211.h> + #include <net80211/ieee80211.h> + #include <net80211/ieee80211_crypto.h> + #include <net80211/ieee80211_ioctl.h> diff --git a/recipes/hostap/hostap-daemon/makefile-cross.diff b/recipes/hostap/hostap-daemon/makefile-cross.diff new file mode 100644 index 0000000000..25d2ca34bb --- /dev/null +++ b/recipes/hostap/hostap-daemon/makefile-cross.diff @@ -0,0 +1,26 @@ +--- Makefile.orig 2005-03-18 14:34:27.274376504 +0100 ++++ Makefile 2005-03-18 14:35:56.609795456 +0100 +@@ -1,7 +1,9 @@ +-CC=gcc ++CC?=gcc + DIR_WPA_SUPPLICANT=. + DIR_HOSTAP=. + ++TARGET_PREFIX ?= /usr/local/bin/ ++ + ifndef CFLAGS + CFLAGS = -MMD -O2 -Wall -g + endif +@@ -170,10 +172,10 @@ + fi + + install: all +- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done ++ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done + + hostapd: $(OBJS) +- $(CC) -o hostapd $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) + + driver_conf.c: Makefile .config + rm -f driver_conf.c diff --git a/recipes/hostap/hostap-daemon/mtx-1/defconfig b/recipes/hostap/hostap-daemon/mtx-1/defconfig new file mode 100644 index 0000000000..8c3065c3b9 --- /dev/null +++ b/recipes/hostap/hostap-daemon/mtx-1/defconfig @@ -0,0 +1,66 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# Integrated EAP authenticator +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP authenticator +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP authenticator +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP authenticator +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP authenticator +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP authenticator +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP authenticator +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP authenticator +#CONFIG_EAP_SIM=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# authenticator from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y diff --git a/recipes/hostap/hostap-daemon/mtx-2/defconfig b/recipes/hostap/hostap-daemon/mtx-2/defconfig new file mode 100644 index 0000000000..8c3065c3b9 --- /dev/null +++ b/recipes/hostap/hostap-daemon/mtx-2/defconfig @@ -0,0 +1,66 @@ +# Example hostapd build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for wired authenticator +CONFIG_DRIVER_WIRED=y + +# Driver interface for madwifi driver +CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src + +# Driver interface for Prism54 driver +CONFIG_DRIVER_PRISM54=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# IEEE 802.11F/IAPP +CONFIG_IAPP=y + +# WPA2/IEEE 802.11i RSN pre-authentication +CONFIG_RSN_PREAUTH=y + +# Integrated EAP authenticator +CONFIG_EAP=y + +# EAP-MD5 for the integrated EAP authenticator +CONFIG_EAP_MD5=y + +# EAP-TLS for the integrated EAP authenticator +CONFIG_EAP_TLS=y + +# EAP-MSCHAPv2 for the integrated EAP authenticator +CONFIG_EAP_MSCHAPV2=y + +# EAP-PEAP for the integrated EAP authenticator +CONFIG_EAP_PEAP=y + +# EAP-GTC for the integrated EAP authenticator +CONFIG_EAP_GTC=y + +# EAP-TTLS for the integrated EAP authenticator +CONFIG_EAP_TTLS=y + +# EAP-SIM for the integrated EAP authenticator +#CONFIG_EAP_SIM=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# RADIUS authentication server. This provides access to the integrated EAP +# authenticator from external hosts using RADIUS. +CONFIG_RADIUS_SERVER=y diff --git a/recipes/hostap/hostap-daemon_0.4.4.bb b/recipes/hostap/hostap-daemon_0.4.4.bb new file mode 100644 index 0000000000..bece7d1450 --- /dev/null +++ b/recipes/hostap/hostap-daemon_0.4.4.bb @@ -0,0 +1,3 @@ +require hostap-daemon.inc + +PR = "r2" diff --git a/recipes/hostap/hostap-daemon_0.4.8.bb b/recipes/hostap/hostap-daemon_0.4.8.bb new file mode 100644 index 0000000000..de3abdbea5 --- /dev/null +++ b/recipes/hostap/hostap-daemon_0.4.8.bb @@ -0,0 +1,5 @@ +require hostap-daemon.inc + +PR = "r1" + +DEFAULT_PREFERENCE = "-1" diff --git a/recipes/hostap/hostap-daemon_0.5.10.bb b/recipes/hostap/hostap-daemon_0.5.10.bb new file mode 100644 index 0000000000..3fc1d8dc11 --- /dev/null +++ b/recipes/hostap/hostap-daemon_0.5.10.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "User space daemon for extended IEEE 802.11 management" +HOMEPAGE = "http://hostap.epitest.fi" +SECTION = "kernel/userland" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" +PR = "r1" + +#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds +MY_ARCH := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" + +SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ + file://makefile-cross.diff;patch=1 \ + file://defconfig \ + file://init" + +S = "${WORKDIR}/hostapd-${PV}" + +export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" + +inherit update-rc.d +INITSCRIPT_NAME=hostapd + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + if [ "x$HAS_PCI" = "x1" ] ; then + echo "CONFIG_DRIVER_MADWIFI=y" >> .config + echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config + fi +} + +do_compile() { + make +} + +do_install() { + install -d ${D}${sbindir} ${D}${sysconfdir}/init.d + make TARGET_PREFIX=${D}${sbindir} install + install -m 0644 hostapd.conf ${D}${sysconfdir} + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd +} + diff --git a/recipes/hostap/hostap-modules-rawtx_0.4.7.bb b/recipes/hostap/hostap-modules-rawtx_0.4.7.bb new file mode 100644 index 0000000000..5a8a243df9 --- /dev/null +++ b/recipes/hostap/hostap-modules-rawtx_0.4.7.bb @@ -0,0 +1,20 @@ +require hostap-modules.inc + +DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset with rawtx patch included" +RDEPENDS_hostap-modules-cs-rawtx = "hostap-modules-rawtx" +RDEPENDS_hostap-modules-pci-rawtx = "hostap-modules-rawtx" + +SRC_URI += "file://kernel_updates.patch;patch=1 \ + file://hostap-driver-0.4.7.patch;patch=1;pnum=1 \ + file://hostap_cs.conf " +SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ + file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" + +S = "${WORKDIR}/hostap-driver-${PV}" + +inherit module + +PACKAGES = "{PN}-dbg hostap-modules-cs-rawtx hostap-modules-pci-rawtx hostap-modules-rawtx" +FILES_hostap-modules-cs-rawtx = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" +FILES_hostap-modules-pci-rawtx = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" +FILES_hostap-modules-rawtx = "/lib/modules/" diff --git a/recipes/hostap/hostap-modules.inc b/recipes/hostap/hostap-modules.inc new file mode 100644 index 0000000000..3184f00fb3 --- /dev/null +++ b/recipes/hostap/hostap-modules.inc @@ -0,0 +1,39 @@ +DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" +SECTION = "kernel/modules" +PRIORITY = "optional" +LICENSE = "GPL" +RRECOMMENDS = "apm-wifi-suspendfix" + +SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz" +SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ + file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" +SRC_URI_append_mtx-2 = " file://mtx_compat.diff;patch=1;pnum=0 \ + file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" +SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " + +S = "${WORKDIR}/hostap-driver-${PV}" + +inherit module + +# Hack Alert :D +ARCH_mipsel = "mips" +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" + +NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ + ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia + for i in ${NET_MODULES} + do + install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ + done + install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ +} + +PACKAGES = "${PN}-dbg hostap-modules-cs hostap-modules-pci hostap-modules" +FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" +FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" +FILES_hostap-modules = "/lib/modules/" +RDEPENDS_hostap-modules-cs = "hostap-modules (${PV}) hostap-conf" +RDEPENDS_hostap-modules-pci = "hostap-modules (${PV})" diff --git a/recipes/hostap/hostap-modules/Makefile.patch b/recipes/hostap/hostap-modules/Makefile.patch new file mode 100644 index 0000000000..2fc5e9ed4b --- /dev/null +++ b/recipes/hostap/hostap-modules/Makefile.patch @@ -0,0 +1,11 @@ +--- hostap-driver-0.2.4/Makefile.old 2004-07-31 10:35:50.000000000 +0100 ++++ hostap-driver-0.2.4/Makefile 2004-07-31 10:35:56.000000000 +0100 +@@ -51,7 +51,7 @@ + + VERFILE := $(KERNEL_PATH)/include/linux/version.h + KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \ +- then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \ ++ then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \ + else uname -r; fi) + KERNELVER := $(shell echo "$(KERNELRELEASE)" | \ + sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/") diff --git a/recipes/hostap/hostap-modules/add_event.patch b/recipes/hostap/hostap-modules/add_event.patch new file mode 100644 index 0000000000..d5f2a10e86 --- /dev/null +++ b/recipes/hostap/hostap-modules/add_event.patch @@ -0,0 +1,28 @@ +Index: hostap-driver-0.3.7/driver/modules/hostap_cs.c +=================================================================== +--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-08-03 17:05:53.000000000 +0100 ++++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-08-03 17:07:59.000000000 +0100 +@@ -526,11 +526,13 @@ + dev_list = link; + client_reg.dev_info = &dev_info; + client_reg.Attributes = INFO_IO_CLIENT; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)) + client_reg.EventMask = CS_EVENT_CARD_INSERTION | + CS_EVENT_CARD_REMOVAL | + CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | + CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; + client_reg.event_handler = &prism2_event; ++#endif + client_reg.Version = 0x0210; + client_reg.event_callback_args.client_data = link; + ret = pcmcia_register_client(&link->handle, &client_reg); +@@ -913,6 +915,9 @@ + .name = "hostap_cs", + }, + .attach = prism2_attach, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++ .event = prism2_event, ++#endif + .detach = prism2_detach, + .owner = THIS_MODULE, + }; diff --git a/recipes/hostap/hostap-modules/hostap-utsname.patch b/recipes/hostap/hostap-modules/hostap-utsname.patch new file mode 100644 index 0000000000..c29cc8d2c9 --- /dev/null +++ b/recipes/hostap/hostap-modules/hostap-utsname.patch @@ -0,0 +1,77 @@ +diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap.c hostap-driver-0.3.7/driver/modules/hostap.c +--- hostap-driver-0.3.7.orig/driver/modules/hostap.c 2005-07-25 09:14:01.995965088 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap.c 2005-07-25 09:13:22.301999488 +0000 +@@ -25,6 +25,7 @@ + #include <linux/if_arp.h> + #include <linux/delay.h> + #include <linux/random.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else +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 +--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:14:01.996964936 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:13:22.302999336 +0000 +@@ -19,6 +19,7 @@ + #include <linux/netdevice.h> + #include <linux/if_ether.h> + #include <linux/if_arp.h> ++#include <linux/utsname.h> + #include <asm/string.h> + + #include "hostap_crypt.h" +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 +--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:14:01.996964936 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:13:22.302999336 +0000 +@@ -19,6 +19,7 @@ + #include <linux/netdevice.h> + #include <linux/if_ether.h> + #include <linux/if_arp.h> ++#include <linux/utsname.h> + #include <asm/string.h> + + #include "hostap_crypt.h" +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 +--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c 2005-07-25 09:14:01.996964936 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c 2005-07-25 09:13:22.302999336 +0000 +@@ -15,6 +15,7 @@ + #include <linux/init.h> + #include <linux/slab.h> + #include <linux/random.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else +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 +--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-07-25 09:14:01.997964784 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-07-25 09:13:22.302999336 +0000 +@@ -12,6 +12,7 @@ + #include <linux/timer.h> + #include <linux/skbuff.h> + #include <linux/netdevice.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else +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 +--- hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c 2005-07-25 09:14:01.997964784 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_pci.c 2005-07-25 09:13:22.303999184 +0000 +@@ -11,6 +11,7 @@ + #include <linux/if.h> + #include <linux/skbuff.h> + #include <linux/netdevice.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else +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 +--- hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c 2005-07-25 09:14:01.997964784 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_plx.c 2005-07-25 09:13:22.303999184 +0000 +@@ -14,6 +14,7 @@ + #include <linux/if.h> + #include <linux/skbuff.h> + #include <linux/netdevice.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else diff --git a/recipes/hostap/hostap-modules/hostap_cardid.patch b/recipes/hostap/hostap-modules/hostap_cardid.patch new file mode 100644 index 0000000000..05f716e22f --- /dev/null +++ b/recipes/hostap/hostap-modules/hostap_cardid.patch @@ -0,0 +1,70 @@ +Index: hostap-driver-0.3.9/driver/modules/hostap_cs.c +=================================================================== +--- hostap-driver-0.3.9.orig/driver/modules/hostap_cs.c 2005-08-24 10:11:47.000000000 +0100 ++++ hostap-driver-0.3.9/driver/modules/hostap_cs.c 2005-08-24 10:39:10.000000000 +0100 +@@ -908,6 +908,57 @@ + return 0; + } + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) ++static struct pcmcia_device_id hostap_cs_ids[] = { ++ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), ++ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), ++ PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), ++ PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), ++ PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), ++ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), ++ PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), ++ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), ++ PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), ++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), ++ PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", ++ 0x7a954bd9, 0x74be00c6), ++ PCMCIA_DEVICE_PROD_ID1234( ++ "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", ++ "Eval-RevA", ++ 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e), ++ PCMCIA_DEVICE_PROD_ID123( ++ "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", ++ 0xe6ec52ce, 0x08649af2, 0x4b74baa0), ++ PCMCIA_DEVICE_PROD_ID123( ++ "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02", ++ 0x71b18589, 0xb6f1b0ab, 0x4b74baa0), ++ PCMCIA_DEVICE_PROD_ID123( ++ "Instant Wireless ", " Network PC CARD", "Version 01.02", ++ 0x11d901af, 0x6e9bd926, 0x4b74baa0), ++ PCMCIA_DEVICE_PROD_ID123( ++ "SMC", "SMC2632W", "Version 01.02", ++ 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0), ++ PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card", ++ 0x54f7c49c, 0x15a75e5b), ++ PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", ++ 0x74c5e40d, 0xdb472a18), ++ PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card", ++ 0x0733cc81, 0x0c52f395), ++ PCMCIA_DEVICE_PROD_ID12( ++ "ZoomAir 11Mbps High", "Rate wireless Networking", ++ 0x273fe3db, 0x32a1eaee), ++ PCMCIA_DEVICE_NULL ++}; ++MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids); ++#endif + + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67) + static struct pcmcia_driver hostap_driver = { +@@ -917,6 +968,7 @@ + .attach = prism2_attach, + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) + .event = prism2_event, ++ .id_table = hostap_cs_ids, + #endif + .detach = prism2_detach, + .owner = THIS_MODULE, diff --git a/recipes/hostap/hostap-modules/ipaq_compat.patch b/recipes/hostap/hostap-modules/ipaq_compat.patch new file mode 100644 index 0000000000..b139ef38f1 --- /dev/null +++ b/recipes/hostap/hostap-modules/ipaq_compat.patch @@ -0,0 +1,11 @@ +--- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old 2005-04-17 09:12:38.304421464 +0100 ++++ hostap-driver-0.3.7/driver/modules/hostap_compat.h 2005-04-17 09:13:04.413452288 +0100 +@@ -5,7 +5,7 @@ + #define NEW_MODULE_CODE + #endif + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD) + + #define HOSTAP_QUEUE struct tq_struct + diff --git a/recipes/hostap/hostap-modules/kernel_updates.patch b/recipes/hostap/hostap-modules/kernel_updates.patch new file mode 100644 index 0000000000..70487a96f8 --- /dev/null +++ b/recipes/hostap/hostap-modules/kernel_updates.patch @@ -0,0 +1,192 @@ +Index: hostap-driver-0.4.4/driver/modules/hostap_cs.c +=================================================================== +--- hostap-driver-0.4.4.orig/driver/modules/hostap_cs.c 2005-08-21 20:23:21.000000000 +0100 ++++ hostap-driver-0.4.4/driver/modules/hostap_cs.c 2005-09-17 17:09:05.000000000 +0100 +@@ -207,12 +207,17 @@ + #include "hostap_hw.c" + + +- ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + static void prism2_detach(dev_link_t *link); ++#else ++static void prism2_detach(struct pcmcia_device *p_dev); ++#endif ++ + static void prism2_release(u_long arg); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + static int prism2_event(event_t event, int priority, + event_callback_args_t *args); +- ++#endif + + static int prism2_pccard_card_present(local_info_t *local) + { +@@ -508,25 +513,36 @@ + } + #endif + ++static int prism2_config(dev_link_t *link); + + /* allocate local data and register with CardServices + * initialize dev_link structure, but do not configure the card yet */ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + static dev_link_t *prism2_attach(void) ++#else ++static int prism2_attach(struct pcmcia_device *p_dev) ++#endif + { + dev_link_t *link; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + client_reg_t client_reg; + int ret; ++#endif + + link = kmalloc(sizeof(dev_link_t), GFP_KERNEL); + if (link == NULL) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + return NULL; +- ++#else ++ return -ENOMEM; ++#endif + memset(link, 0, sizeof(dev_link_t)); + + PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info); + link->conf.Vcc = 33; + link->conf.IntType = INT_MEMORY_AND_IO; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + /* register with CardServices */ + link->next = dev_list; + dev_list = link; +@@ -547,12 +563,28 @@ + prism2_detach(link); + return NULL; + } ++ + return link; +-} ++#else ++ link->handle = p_dev; ++ p_dev->instance = link; ++ ++ link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; ++ prism2_config(link); + ++ return 0; ++#endif ++} + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + static void prism2_detach(dev_link_t *link) ++#else ++static void prism2_detach(struct pcmcia_device *p_dev) ++#endif + { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) ++ dev_link_t *link = dev_to_instance(p_dev); ++#endif + dev_link_t **linkp; + + PDEBUG(DEBUG_FLOW, "prism2_detach\n"); +@@ -570,6 +602,7 @@ + prism2_release((u_long)link); + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + if (link->handle) { + int res = pcmcia_deregister_client(link->handle); + if (res) { +@@ -577,6 +610,7 @@ + cs_error(link->handle, DeregisterClient, res); + } + } ++#endif + + *linkp = link->next; + /* release net devices */ +@@ -855,7 +889,53 @@ + PDEBUG(DEBUG_FLOW, "release - done\n"); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) ++static int prism2_suspend1(struct pcmcia_device *dev) ++{ ++ dev_link_t *link = dev_to_instance(dev); ++ struct net_device *ndev = (struct net_device *) link->priv; ++ ++ PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info); ++ link->state |= DEV_SUSPEND; ++ /* fall through */ + ++ if (link->state & DEV_CONFIG) { ++ if (link->open) { ++ netif_stop_queue(ndev); ++ netif_device_detach(ndev); ++ } ++ prism2_suspend(ndev); ++ pcmcia_release_configuration(link->handle); ++ } ++ ++ return 0; ++} ++ ++static int prism2_resume1(struct pcmcia_device *dev) ++{ ++ dev_link_t *link = dev_to_instance(dev); ++ struct net_device *ndev = (struct net_device *) link->priv; ++ ++ PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info); ++ ++ link->state &= ~DEV_SUSPEND; ++ /* fall through */ ++ ++ if (link->state & DEV_CONFIG) { ++ pcmcia_request_configuration(link->handle, &link->conf); ++ prism2_hw_shutdown(ndev, 1); ++ prism2_hw_config(ndev, link->open ? 0 : 1); ++ if (link->open) { ++ netif_device_attach(ndev); ++ netif_start_queue(ndev); ++ } ++ } ++ ++ return 0; ++} ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + static int prism2_event(event_t event, int priority, + event_callback_args_t *args) + { +@@ -924,7 +1004,7 @@ + } + return 0; + } +- ++#endif + + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67) + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)) +@@ -983,11 +1063,20 @@ + .drv = { + .name = "hostap_cs", + }, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) ++ .probe = prism2_attach, ++ .remove = prism2_detach, ++ .suspend = prism2_suspend1, ++ .resume = prism2_resume1, ++#else + .attach = prism2_attach, + .detach = prism2_detach, ++#endif + .owner = THIS_MODULE, + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) + .event = prism2_event, ++#endif + .id_table = hostap_cs_ids, + #endif + }; diff --git a/recipes/hostap/hostap-modules/mtx_compat.diff b/recipes/hostap/hostap-modules/mtx_compat.diff new file mode 100644 index 0000000000..c2d6662d69 --- /dev/null +++ b/recipes/hostap/hostap-modules/mtx_compat.diff @@ -0,0 +1,20 @@ +--- driver/modules/hostap_compat.h.orig 2004-08-09 16:16:48.359929856 +0200 ++++ driver/modules/hostap_compat.h 2004-08-09 16:17:12.383277752 +0200 +@@ -13,7 +13,7 @@ + MOD_INC_USE_COUNT; \ + if (schedule_task((q)) == 0) \ + MOD_DEC_USE_COUNT; +- ++/* + static inline void flush_scheduled_work(void) + { + flush_scheduled_tasks(); +@@ -27,7 +27,7 @@ + tq->routine = routine; + tq->data = data; + } +- ++*/ + #else /* kernel < 2.5.44 */ + + #define HOSTAP_QUEUE struct work_struct diff --git a/recipes/hostap/hostap-modules/mtx_hostap_deferred_irq.diff b/recipes/hostap/hostap-modules/mtx_hostap_deferred_irq.diff new file mode 100644 index 0000000000..e979b72d93 --- /dev/null +++ b/recipes/hostap/hostap-modules/mtx_hostap_deferred_irq.diff @@ -0,0 +1,81 @@ +--- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100 ++++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100 +@@ -50,6 +50,13 @@ + }; + + ++#define DEFERRED_IRQ_INITIALIZATION ++ ++#ifdef DEFERRED_IRQ_INITIALIZATION ++struct net_device *devb[MAX_PARM_DEVICES]; ++#endif ++ ++ + #ifdef PRISM2_IO_DEBUG + + static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v) +@@ -280,6 +287,10 @@ + + pci_set_drvdata(pdev, dev); + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++ printk("%s: deferred initialization of IRQs\n", dev_info); ++ devb[cards_found-1] = dev; ++#else + if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name, + dev)) { + printk(KERN_WARNING "%s: request_irq failed\n", dev->name); +@@ -295,7 +306,7 @@ + + printk(KERN_INFO "%s: Intersil Prism2.5 PCI: " + "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq); +- ++#endif + return hostap_hw_ready(dev); + + fail: +@@ -399,18 +410,43 @@ + }; + + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++static void deferred_init(int num_devices) ++{ ++ int n; ++ for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++) ++ { ++ if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name, ++ devb[n])) { ++ printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name); ++ } ++ if (prism2_hw_config(devb[n], 1)) { ++ printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name) ++; ++ } ++ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]-> ++irq); ++ } ++} ++#endif ++ + static int __init init_prism2_pci(void) + { + printk(KERN_INFO "%s: %s\n", dev_info, version); + + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) +- if (pci_register_driver(&prism2_pci_drv_id) <= 0) { ++ int n; ++ if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) { + printk("hostap_pci: No devices found, driver not " + "installed.\n"); + pci_unregister_driver(&prism2_pci_drv_id); + return -ENODEV; + } + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++ deferred_init(n); ++#endif ++ + return 0; + #else + return pci_register_driver(&prism2_pci_drv_id); diff --git a/recipes/hostap/hostap-modules_0.4.4.bb b/recipes/hostap/hostap-modules_0.4.4.bb new file mode 100644 index 0000000000..f415d31614 --- /dev/null +++ b/recipes/hostap/hostap-modules_0.4.4.bb @@ -0,0 +1,4 @@ +require hostap-modules.inc +PR = "r7" + +SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/recipes/hostap/hostap-modules_0.4.7.bb b/recipes/hostap/hostap-modules_0.4.7.bb new file mode 100644 index 0000000000..369240cfe4 --- /dev/null +++ b/recipes/hostap/hostap-modules_0.4.7.bb @@ -0,0 +1,4 @@ +require hostap-modules.inc +PR = "r5" + +SRC_URI += "file://kernel_updates.patch;patch=1" diff --git a/recipes/hostap/hostap-utils.inc b/recipes/hostap/hostap-utils.inc new file mode 100644 index 0000000000..94cb42010d --- /dev/null +++ b/recipes/hostap/hostap-utils.inc @@ -0,0 +1,22 @@ +DESCRIPTION = "User mode helpers for the hostap driver" +HOMEPAGE = "http://hostap.epitest.fi" +SECTION = "kernel/userland" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r5" + +SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ + file://hostap-fw-load.patch;patch=1" +S = "${WORKDIR}/hostap-utils-${PV}" + +BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \ + hostap_rid prism2_param prism2_srec split_combined_hex" + +do_install() { + install -d ${D}${sbindir}/ + for f in ${BINARIES} + do + install -m 0755 $f ${D}${sbindir}/ + done +} + diff --git a/recipes/hostap/hostap-utils_0.4.0.bb b/recipes/hostap/hostap-utils_0.4.0.bb new file mode 100644 index 0000000000..9fe362b19f --- /dev/null +++ b/recipes/hostap/hostap-utils_0.4.0.bb @@ -0,0 +1 @@ +require hostap-utils.inc diff --git a/recipes/hostap/hostap-utils_0.4.7.bb b/recipes/hostap/hostap-utils_0.4.7.bb new file mode 100644 index 0000000000..9fe362b19f --- /dev/null +++ b/recipes/hostap/hostap-utils_0.4.7.bb @@ -0,0 +1 @@ +require hostap-utils.inc |