merge of 5945a66a6847c21d25595376695c23f3971f6f8a

     and e544df2d6779a2a53f1c47a6d1e1961d875d17af

15 files changed, 13 insertions, 303 deletions

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
deleted file mode 100644
index 69f8ac1db2..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-WLAN_VERSION=0
-WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=2
-WLAN_EXTRAVERSION=
-#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=
-PREFIX=
-INST_EXEDIR=/sbin
-#TARGET_ROOT_ON_HOST=
-#RC_DIR=/etc/init.d
-PCMCIA_DIR=/etc/pcmcia
-SYSV_INIT=y
-INSTALL_DEPMOD=
-WLAN_DEBUG=n
-CROSS_COMPILE_ENABLED=n
-CROSS_COMPILE=
-HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
-PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch
deleted file mode 100644
index a156229331..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.2/src/include/wlan/wlan_compat.h~might_sleep
-+++ linux-wlan-ng-0.2.2/src/include/wlan/wlan_compat.h
-@@ -584,7 +584,7 @@
- #endif
- 
- #ifndef might_sleep
--#define might_sleep(a)   do { } while (0)
-+#define might_sleep()   do { } while (0)
- #endif
- 
- /* Apparently 2.4.2 ethtool is quite different, maybe newer too? */
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch
deleted file mode 100644
index a22d39dca2..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c~	2005-07-20 19:16:55.000000000 +0200
-+++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c	2005-09-01 19:02:59.099563318 +0200
-@@ -22,12 +22,16 @@
- 						 * says.
- 						 */
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) )
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,5))
- static int numlist = 4;
- module_param_array(irq_list, int, numlist, 0444);
- #else
- module_param_array(irq_list, int, NULL, 0444);
- #endif
-+#else
-+MODULE_PARM( irq_list, "1-4i" );
-+#endif
- module_param( irq_mask, int, 0644);
- #endif
- 
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch
deleted file mode 100644
index 4ce8173f93..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.2/wlan_compat.h
-+++ /dev/null
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch
deleted file mode 100644
index d98116b07c..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_usb.c~msleep-vs-mdelay
-+++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_usb.c
-@@ -279,7 +279,7 @@
- 		 * is "wake up", so that's easy.
- 		 * (I'd like a better way to do this, really.)
- 		 */
--		msleep(100);
-+		mdelay(100);
- 
- 		/* Now delete the CTLXs, because no-one else can now. */
- 		list_for_each_safe(entry, temp, &cleanlist) {
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch
deleted file mode 100644
index 4f59f0fa5d..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h~no-compat
-+++ linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h
-@@ -351,14 +351,14 @@
- 
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
- #ifdef _LINUX_LIST_H
--
-+/*
- static inline void list_move_tail(struct list_head *list,
-           struct list_head *head)
- {
-         __list_del(list->prev, list->next);
-         list_add_tail(list, head);
- }
--
-+*/
- static inline void __list_splice(struct list_head *list,
-                                 struct list_head *head)
- {
-@@ -372,13 +372,13 @@
-       last->next = at;
-       at->prev = last;
- }
--
-+/*
- static inline void list_move(struct list_head *list, struct list_head *head)
- {
-       __list_del(list->prev, list->next);
-       list_add(list, head);
- }
--
-+*/
- static inline void list_splice_init(struct list_head *list,
-             struct list_head *head)
- {
-@@ -388,7 +388,6 @@
-        }
- }
- 
--
- #endif  // LIST_H
- #endif
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch
deleted file mode 100644
index a119460a1d..0000000000
--- a/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch
-+++ linux-wlan-ng-0.2.1-pre26/src/Makefile
-@@ -44,10 +44,8 @@
- 
- include ../config.mk
- 
--DIRS=p80211 prism2 shared wlanctl wland nwepgen \
--	mkmeta wlancfg
--ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
--	nwepgen wlancfg
-+DIRS=p80211 prism2 shared mkmeta
-+ALL_DIRS=mkmeta p80211 prism2 shared
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch
-+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile
-@@ -44,7 +44,7 @@
- 
- include ../../config.mk
- 
--DIRS=driver ridlist download
-+DIRS=driver ridlist
- 
- ifneq ($(wildcard *.addon),) 
- DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc
index b27bad1a38..8be211d4c9 100644
--- a/packages/wlan-ng/wlan-ng-modules.inc
+++ b/packages/wlan-ng/wlan-ng-modules.inc
@@ -25,10 +25,10 @@ do_configure() {
 	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
 	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
 
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
+#        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+#                echo "PRISM2_PCMCIA=y"          >> config.mk
+#                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
+#        fi
         echo "TARGET_ROOT_ON_HOST=${D}/"         >> config.mk
         echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
 	echo "CC=${KERNEL_CC}"			>> config.mk
diff --git a/packages/wlan-ng/wlan-ng-modules/config.in b/packages/wlan-ng/wlan-ng-modules/config.in
index 9a34bf5f7b..a2b245e967 100644
--- a/packages/wlan-ng/wlan-ng-modules/config.in
+++ b/packages/wlan-ng/wlan-ng-modules/config.in
@@ -15,7 +15,7 @@ WLAN_DEBUG=n
 CROSS_COMPILE_ENABLED=n
 CROSS_COMPILE=
 HOST_COMPILE=
-PRISM2_PLX=y
-PRISM2_PCMCIA=y
-PRISM2_PCI=y
+PRISM2_PLX=n
+PRISM2_PCMCIA=n
+PRISM2_PCI=n
 PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-modules/usb-owner.patch b/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
index aa66ceeef9..06a305548e 100644
--- a/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
+++ b/packages/wlan-ng/wlan-ng-modules/usb-owner.patch
@@ -1,13 +1,13 @@
 Index: trunk/src/prism2/driver/prism2_usb.c
 ===================================================================
---- trunk.orig/src/prism2/driver/prism2_usb.c	2006-03-22 09:10:51.049384984 +0100
-+++ trunk/src/prism2/driver/prism2_usb.c	2006-03-22 09:14:39.152708008 +0100
+--- trunk.orig/src/prism2/driver/prism2_usb.c	2006-04-02 11:06:32.045530320 +0200
++++ trunk/src/prism2/driver/prism2_usb.c	2006-04-02 11:09:31.080312896 +0200
 @@ -313,7 +313,7 @@
  
  
  struct usb_driver prism2_usb_driver = {
--#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19))
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)) 
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))) 
  	.owner = THIS_MODULE,
  #endif
  	.name = "prism2_usb",
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
deleted file mode 100644
index 177eb41fd6..0000000000
--- a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards"
-HOMEPAGE = "http://www.linux-wlan.org"
-SECTION = "kernel/modules"
-DEPENDS = "virtual/kernel"
-RRECOMMENDS = "wlan-ng-utils"
-LICENSE = "GPL"
-PR = "r1"
-
-# 0.2.1-pre works with the tosa internal wlan chipset, while 0.2.2 does not :/
-DEFAULT_PREFERENCE_tosa = "-1"
-
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-	file://no-compat.patch;patch=1 \
-	file://msleep-vs-mdelay.patch;patch=1 \
-	file://might-sleep.patch;patch=1 \
-	file://only-the-modules.patch;patch=1 \
-	file://module_param_array.patch;patch=1 \
-	file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://config.in"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
-inherit module
-
-PARALLEL_MAKE = ""
-EXTRA_OEMAKE = "CC="${KERNEL_CC}" LD=${KERNEL_LD} PARALLEL_MAKE=''"
-
-do_configure() {
-	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
-	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
-
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
-        echo "TARGET_ROOT_ON_HOST=${D}/"         >> config.mk
-        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
-	echo "CC=${KERNEL_CC}"			>> config.mk
-	echo "LD=${KERNEL_LD}"			>> config.mk
-	echo "LDFLAGS="				>> config.mk
-
-	# Listen closely... sssshhh... can you hear the wlan-ng build system suck?
-	rm -f ${KERNEL_SOURCE}/../config.mk
-	rm -f ${KERNEL_SOURCE}/../../config.mk
-	ln -sf ${S}/config.mk	${KERNEL_SOURCE}/..
-	ln -sf ${S}/config.mk	${KERNEL_SOURCE}/../..
-	install -m 0655 config.mk src/prism2/config.mk
-	install -d src/prism2/driver/include
-	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
-	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
-}
-
-do_compile() {
-	oe_runmake -C src all
-}
-
-do_install() {
-	oe_runmake install DESTDIR=${D}
-
-        # Listen closely... sssshhh... can you hear the wlan-ng build system suck?
-        rm -f ${KERNEL_SOURCE}/../config.mk
-        rm -f ${KERNEL_SOURCE}/../../config.mk	
-}
-
-FILES_${PN} = "/lib"
diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb
index 01457bbae3..4fa16c4de8 100644
--- a/packages/wlan-ng/wlan-ng-modules_svn.bb
+++ b/packages/wlan-ng/wlan-ng-modules_svn.bb
@@ -1,6 +1,6 @@
 include wlan-ng-modules.inc
 PR = "r0"
-PV = "0.23+svn${SRCDATE}"
+PV = "0.2.3+svn${SRCDATE}"
 
 SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk "
 S = "${WORKDIR}/trunk"
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb b/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
deleted file mode 100644
index 17cf3cab83..0000000000
--- a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb
+++ /dev/null
@@ -1,68 +0,0 @@
-DESCRIPTION = "linux-wlan-ng userland utilities"
-HOMEPAGE = "http://www.linux-wlan.org"
-SECTION = "kernel/userland"
-DEPENDS = "virtual/kernel"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
-	file://only-the-utils.patch;patch=1 \
-	file://scripts-makefile-hostcc.patch;patch=1 \
-	file://pcmciasrc.patch;patch=1 \
-	file://wlan-ng.modutils \
-	file://wlan.agent \
-	file://usbctl \
-	file://resume \
-	file://pre-up \
-	file://post-down \
-	file://config.in"
-S = "${WORKDIR}/linux-wlan-ng-${PV}"
-
-# yeah, it's kind of backwards, but otherwise the config step will fail
-inherit module
-
-do_configure() {
-	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
-	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
-
-        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
-                echo "PRISM2_PCMCIA=y"          >> config.mk
-                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
-        fi
-        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
-	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
-        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
-	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
-        echo "RC_DIR=${sysconfdir}/"             >> config.mk
-	echo "CC=${CC}"			>> config.mk
-	echo "LD=${LD}"			>> config.mk
-
-	# Shut up, you broken buildsystem
-	install -m 0655 config.mk src/prism2/config.mk
-	install -d src/prism2/driver/include
-	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
-	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
-}
-
-do_compile() {
-	oe_runmake all
-}
-
-do_install() {
-	oe_runmake install
-	mkdir -p ${D}${sysconfdir}/modutils/
-	mkdir -p ${D}${sysconfdir}/hotplug/
-	mkdir -p ${D}${base_sbindir}/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
-	install -d ${D}${sysconfdir}/network/if-pre-up.d
-	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
-	install -d ${D}${sysconfdir}/network/if-post-down.d
-	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
-	install -d ${D}${sysconfdir}/apm/resume.d
-	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
-	install -d ${D}${mandir}
-}
-
-FILES_${PN} = "/etc /sbin"
diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb
index b57a0dffd5..a5762e32aa 100644
--- a/packages/wlan-ng/wlan-ng-utils_svn.bb
+++ b/packages/wlan-ng/wlan-ng-utils_svn.bb
@@ -4,7 +4,7 @@ SECTION = "kernel/userland"
 DEPENDS = "virtual/kernel"
 LICENSE = "GPL"
 PR = "r0"
-PV = "0.23+svn${SRCDATE}"
+PV = "0.2.3+svn${SRCDATE}"
 
 SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \
 	file://only-the-utils.patch;patch=1 \