hostap: Sync with OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@918 311d38ba-8fff-0310-9ca6-ca027cbcb966

6 files changed, 58 insertions, 5 deletions

diff --git a/meta/packages/hostap/files/hostap_cs.conf b/meta/packages/hostap/files/hostap_cs.conf
index abf9c7a247..8dda82aad3 100644
--- a/meta/packages/hostap/files/hostap_cs.conf
+++ b/meta/packages/hostap/files/hostap_cs.conf
@@ -183,3 +183,11 @@ 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/meta/packages/hostap/files/hostap_cs.modalias b/meta/packages/hostap/files/hostap_cs.modalias
new file mode 100644
index 0000000000..cb9efab271
--- /dev/null
+++ b/meta/packages/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/meta/packages/hostap/hostap-conf_1.0.bb b/meta/packages/hostap/hostap-conf_1.0.bb
index 1b0edf19cb..b95b3dd2c4 100644
--- a/meta/packages/hostap/hostap-conf_1.0.bb
+++ b/meta/packages/hostap/hostap-conf_1.0.bb
@@ -3,13 +3,32 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PACKAGE_ARCH = "all"
-PR = "r4"
+PR = "r8"
 
 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/meta/packages/hostap/hostap-modules.inc b/meta/packages/hostap/hostap-modules.inc
index a3bf503f9f..9a928210c6 100644
--- a/meta/packages/hostap/hostap-modules.inc
+++ b/meta/packages/hostap/hostap-modules.inc
@@ -7,6 +7,8 @@ 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 "
 
diff --git a/meta/packages/hostap/hostap-utils_0.3.7.bb b/meta/packages/hostap/hostap-utils_0.3.7.bb
index abfcf53663..9fe362b19f 100644
--- a/meta/packages/hostap/hostap-utils_0.3.7.bb
+++ b/meta/packages/hostap/hostap-utils_0.3.7.bb
@@ -1,3 +1 @@
 require hostap-utils.inc
-
-PR = "r3"
diff --git a/meta/packages/hostap/hostap-utils_0.4.0.bb b/meta/packages/hostap/hostap-utils_0.4.0.bb
index abfcf53663..9fe362b19f 100644
--- a/meta/packages/hostap/hostap-utils_0.4.0.bb
+++ b/meta/packages/hostap/hostap-utils_0.4.0.bb
@@ -1,3 +1 @@
 require hostap-utils.inc
-
-PR = "r3"