Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

14 files changed, 0 insertions, 708 deletions

diff --git a/wlan-ng/files/Ambit_usb.patch b/wlan-ng/files/Ambit_usb.patch
deleted file mode 100644
index 7dcc09a882..0000000000
--- a/wlan-ng/files/Ambit_usb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- linux-wlan-ng-0.2.1pre21/src/prism2/driver/prism2_usb.c	2004-03-25 10:03:26.000000000 -0600
-+++ linux-wlan-ng-0.2.1pre21/src/prism2/driver/prism2_usb.c~Ambit_usb	2004-09-16 14:26:54.746340840 -0500
-@@ -34,9 +34,9 @@
- 	{PRISM_USB_DEVICE(0x0b3b, 0x1602, "ZyXEL ZyAIR B200 Wireless USB Adapter")},
- 	{PRISM_USB_DEVICE(0x0baf, 0x00eb, "USRobotics USR1120 Wireless USB Adapter")},
- 	{PRISM_USB_DEVICE(0x0411, 0x0027, "Melco WLI-USB-KS11G 11Mbps WLAN Adapter")},
--        {PRISM_USB_DEVICE(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")},
-+   {PRISM_USB_DEVICE(0x04f1, 0x3009, "JVC MP-XP7250 Builtin USB WLAN Adapter")},
- 	{PRISM_USB_DEVICE(0x0846, 0x4110, "NetGear MA111")},
--        {PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")},
-+   {PRISM_USB_DEVICE(0x03f3, 0x0020, "Adaptec AWN-8020 USB WLAN Adapter")},
- //	{PRISM_USB_DEVICE(0x0ace, 0x1201, "ZyDAS ZD1201 Wireless USB Adapter")},
- 	{PRISM_USB_DEVICE(0x2821, 0x3300, "ASUS-WL140 Wireless USB Adapter")},
- 	{PRISM_USB_DEVICE(0x2001, 0x3700, "DWL-122 Wireless USB Adapter")},
-@@ -48,6 +48,7 @@
- 	{PRISM_USB_DEVICE(0x0411, 0x0044, "Melco WLI-USB-KB11 11Mbps WLAN Adapter")},
- 	{PRISM_USB_DEVICE(0x1668, 0x6106, "ROPEX FreeLan 802.11b USB Adapter")},
- 	{PRISM_USB_DEVICE(0x124a, 0x4017, "Pheenet WL-503IA 802.11b USB Adapter")},
-+	{PRISM_USB_DEVICE(0x0bb2, 0x0302, "Ambit Microsystems Corp. CE-WL08 802.11b WLAN Module")},
- 	{ /* terminator */ }
- };
- 
diff --git a/wlan-ng/files/OZ-Configure.patch b/wlan-ng/files/OZ-Configure.patch
deleted file mode 100644
index 3ec9d617c7..0000000000
--- a/wlan-ng/files/OZ-Configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- linux-wlan-ng-0.2.1pre22/Configure-dist	2004-08-05 00:55:27.000000000 +1000
-+++ linux-wlan-ng-0.2.1pre22/Configure	2004-10-28 02:28:06.000000000 +1000
-@@ -431,16 +431,8 @@
- 	if [ -d /etc/rc.d/init.d -o -d /etc/init.d -o -d /sbin/init.d ] ; then
- 	$ECHO "It looks like you have a System V init file setup."
- 	SYSV_INIT=y
--	if [ -d /etc/rc.d/init.d ] ; then
--		$ECHO "RC_DIR=/etc/rc.d" >> $CONFIG
--		$ECHO "RC_DIR=/etc/rc.d" >> $CONFIG_MK
--	elif [ -d /sbin/init.d ] ; then
--		$ECHO "RC_DIR=/sbin" >> $CONFIG
--		$ECHO "RC_DIR=/sbin" >> $CONFIG_MK
--	else
- 		$ECHO "RC_DIR=/etc" >> $CONFIG
- 		$ECHO "RC_DIR=/etc" >> $CONFIG_MK
--	fi
- 	else
- 	$ECHO "It looks like you have a BSD-ish init file setup."
- 	if ! grep rc.wlan /etc/rc.d/rc.S >/dev/null ; then
diff --git a/wlan-ng/files/config.in b/wlan-ng/files/config.in
deleted file mode 100644
index ba6e4c6657..0000000000
--- a/wlan-ng/files/config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-WLAN_VERSION=0
-WLAN_PATCHLEVEL=2
-WLAN_SUBLEVEL=1
-WLAN_EXTRAVERSION=-pre22
-#LINUX_SRC=$(KERNEL_SOURCE)
-PCMCIA_SRC=
-PREFIX=
-INST_EXEDIR=/sbin
-#TARGET_ROOT_ON_HOST=
-#RC_DIR=/etc/rc.d
-PCMCIA_DIR=/etc/pcmcia
-SYSV_INIT=y
-INSTALL_DEPMOD=y
-WLAN_DEBUG=n
-CROSS_COMPILE_ENABLED=n
-CROSS_COMPILE=
-HOST_COMPILE=
-#PRISM2_PLX=n
-#PRISM2_PCMCIA=n
-#PRISM2_PCI=y
-#PRISM2_USB=n
diff --git a/wlan-ng/files/config.mk b/wlan-ng/files/config.mk
deleted file mode 100644
index 09ad89d965..0000000000
--- a/wlan-ng/files/config.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-PRISM2_PCMCIA=y
-PRISM2_PLX=n
-PRISM2_PCI=n
-PRISM2_USB=y
-LINUX_SRC=$(KERNEL_SOURCE)
-# KERN_25=y
-CONFIG_NETLINK=y
-CONFIG_PACKET=y
-CONFIG_HOTPLUG=y
-KERNEL_CFLAGS=-D__KERNEL__ -Iinclude  -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe 
--mpreferred-stack-boundary=2 -funit-at-a-time -Wdeclaration-after-statement
-KERNEL_MODFLAGS=-DMODULE
-WLAN_KERN_PCMCIA=y
-TARGET_ROOT_ON_HOST=$(DESTDIR)
-PCMCIA_DIR=/etc/pcmcia
-TARGET_PCMCIA_DIR=/etc/pcmcia
-MODDIR=/lib/modules/$(KERNEL_VERSION)
-TARGET_MODDIR=$(TARGET_ROOT_ON_HOST)/$(MODDIR)
-INST_EXEDIR=/sbin
-TARGET_INST_EXEDIR=$(TARGET_ROOT_ON_HOST)/sbin
-RC_DIR=/etc
-SYSV_INIT=y
-# INSTALL_DEPMOD is not defined
-HOST_COMPILE=
-HOST_CFLAGS=$(CFLAGS)
-HOST_AS=$(HOST_COMPILE)as
-HOST_LD=$(HOST_COMPILE)ld
-HOST_CC=$(HOST_COMPILE)gcc
-HOST_CPP=$(HOST_CC) -E
-HOST_AR=$(HOST_COMPILE)ar
-HOST_NM=$(HOST_COMPILE)nm
-HOST_STRIP=$(HOST_COMPILE)strip
-HOST_OBJCOPY=$(HOST_COMPILE)objcopy
-HOST_OBJDUMP=$(HOST_COMPILE)objdump
-HOST_RANLIB=$(HOST_COMPILE)ranlib
-HOST_MAKE=make
-CROSS_COMPILE=y
-# CROSS_COMPILE_ENABLED is not defined
-MAKE=make
-# WLAN_DEBUG is not defined
-FIRMWARE_DIR=/etc/wlan/
diff --git a/wlan-ng/files/no-compat.patch b/wlan-ng/files/no-compat.patch
deleted file mode 100644
index 4f59f0fa5d..0000000000
--- a/wlan-ng/files/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/wlan-ng/files/pass-kernel-cross.patch b/wlan-ng/files/pass-kernel-cross.patch
deleted file mode 100644
index c9c00cdc25..0000000000
--- a/wlan-ng/files/pass-kernel-cross.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- src/p80211/Makefile.orig	2004-09-13 16:53:46.000000000 +0200
-+++ src/p80211/Makefile	2004-10-18 18:20:37.130194928 +0200
-@@ -44,6 +44,13 @@
- 
- include $(WLAN_SRC)../../config.mk
- 
-+passvars = \
-+      KERNEL_PATH='$(KERNEL_PATH)' \
-+      KERNEL_SRC='$(KERNEL_SRC)' \
-+      KERNEL_VERSION='$(KERNEL_VERSION)' \
-+      CC='$(KERNEL_CC)' \
-+      LD='$(KERNEL_LD)'
-+
- ifeq ($(WLAN_DEBUG), y)
- WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG
- endif
-@@ -89,11 +96,11 @@
- 	fi
- 
- 	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \
--		MODVERDIR=$(PWD)/../.tmp_versions modules
-+		MODVERDIR=$(PWD)/../.tmp_versions $(passvars) modules
- else # kbuild 2.4
- 
- 	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \
--		modules
-+		$(passvars) modules
- endif # kbuild switch
- 
- endif  # KERNELRELEASE
---- src/prism2/driver/Makefile.orig	2004-08-04 19:27:56.000000000 +0200
-+++ src/prism2/driver/Makefile	2004-10-18 18:20:06.614833968 +0200
-@@ -44,6 +44,13 @@
- 
- include $(WLAN_SRC)../../../config.mk
- 
-+passvars = \
-+      KERNEL_PATH='$(KERNEL_PATH)' \
-+      KERNEL_SRC='$(KERNEL_SRC)' \
-+      KERNEL_VERSION='$(KERNEL_VERSION)' \
-+      CC='$(KERNEL_CC)' \
-+      LD='$(KERNEL_LD)'
-+
- ifeq ($(WLAN_DEBUG), y)
- WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG
- endif
-@@ -85,11 +92,11 @@
- default:
- ifeq ($(KERN_25), y)
- 	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \
--		MODVERDIR=$(PWD)/../.tmp_versions modules
-+		MODVERDIR=$(PWD)/../.tmp_versions $(passvars) modules
- else # kbuild 2.4
- 
- 	$(MAKE) -C $(LINUX_SRC) SUBDIRS=$(PWD) WLAN_SRC=$(PWD)/ \
--		modules
-+		$(passvars) modules
- 
- endif # kbuild switch
- 
---- src/prism2/Makefile.orig	2004-02-13 19:47:37.000000000 +0100
-+++ src/prism2/Makefile	2004-10-18 18:19:13.511906840 +0200
-@@ -44,6 +44,13 @@
- 
- include ../../config.mk
- 
-+passvars = \
-+      KERNEL_PATH='$(KERNEL_PATH)' \
-+      KERNEL_SRC='$(KERNEL_SRC)' \
-+      KERNEL_VERSION='$(KERNEL_VERSION)' \
-+      KERNEL_CC='$(KERNEL_CC)' \
-+      KERNEL_LD='$(KERNEL_LD)'
-+
- DIRS=driver ridlist download
- 
- ifneq ($(wildcard *.addon),) 
-@@ -51,10 +58,10 @@
- endif
- 
- all:
--	set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done
-+	set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars); done
- 
- clean:
--	set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done
-+	set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) clean ; done
- 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags
- 	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
- 
-@@ -68,7 +75,7 @@
- 			cp $$x $(TARGET_ROOT_ON_HOST)$(FIRMWARE_DIR)/prism2_`echo $$x |  cut -c1-2`.hex ; \
- 		fi; \
- 	done 
--	set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done
-+	set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) install ; done
- 
- ctags:
- 	ctags -R
---- Makefile.orig	2004-02-13 19:47:36.000000000 +0100
-+++ Makefile	2004-10-18 18:16:58.126488552 +0200
-@@ -42,6 +42,12 @@
- #
- # --------------------------------------------------------------------
- 
-+passvars = \
-+      KERNEL_PATH='$(KERNEL_PATH)' \
-+      KERNEL_SRC='$(KERNEL_SRC)' \
-+      KERNEL_VERSION='$(KERNEL_VERSION)' \
-+      KERNEL_CC='$(KERNEL_CC)' \
-+      KERNEL_LD='$(KERNEL_LD)'
- 
- DIRS = src doc man etc
- 
-@@ -60,7 +66,7 @@
- 	@echo " "
- 
- all:    config.mk
--	set -e; for d in $(DIRS); do $(MAKE) -C $$d ; done
-+	set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars); done
- 
- mrproper: clean
- 	rm -f config.out
-@@ -68,7 +74,7 @@
- 
- clean:
- 	touch config.mk config.new
--	set -e; for d in $(DIRS); do $(MAKE) -C $$d clean ; done
-+	set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) clean ; done
- 	rm -f core core.* *.o .*.o *.s *.a .depend tmp_make *~ tags 
- 	for i in *_obj; do if [ -d $$i ]; then rm -fr $$i; fi; done
- 	rm -f config.mk config.new
-@@ -76,7 +82,7 @@
- 
- install:
- 	find . -name .depend -exec rm {} \;
--	set -e; for d in $(DIRS); do $(MAKE) -C $$d install ; done
-+	set -e; for d in $(DIRS); do $(MAKE) -C $$d $(passvars) install ; done
- 
- auto_config config.mk:
- 	@touch config.mk config.new
diff --git a/wlan-ng/files/post-down b/wlan-ng/files/post-down
deleted file mode 100644
index bf4ba0ae60..0000000000
--- a/wlan-ng/files/post-down
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# This script takes care of bringing down wlan-ng devices.
-# It is run by ifdown.
-
-WLANCTL=/sbin/wlanctl-ng
-
-if [ ! -x $WLANCTL ] ; then 
-	exit 0
-fi
-
-case $IFACE in
-wlan?)
-	# Reset device to make sure it is not trying to generate
-	# interrupts.
-	result=`$WLANCTL $IFACE lnxreq_ifstate ifstate=disable`
-
-	# Remove modules. Of course, for all I know they are still in use
-	# by another interface, in which case these rmmods will fail. Also,
-	# depending on how modutils is set up, different prism2 modules
-	# might be loaded.
-	(
-		rmmod prism2_pci || rmmod prism2_cs || rmmod prism2_usb || \
-			rmmod prism2_plx || true
-		rmmod p80211 || true
-	) 2>/dev/null
-	
-	# Remove lock file, just in case.
-	rm -f /var/lock/wlan-$IFACE.lock
-;;
-esac
diff --git a/wlan-ng/files/pre-up b/wlan-ng/files/pre-up
deleted file mode 100644
index 0ae410edfa..0000000000
--- a/wlan-ng/files/pre-up
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/bin/sh
-
-case "$METHOD" in loopback) exit 0 ;; esac
-
-#
-# This script takes care of bringing up wlan-ng device.
-# It is run by ifup, and gets information from the 
-# /etc/network/interfaces file. It is derived from the
-# init.d/wlan script in the wlan-ng distribution 
-
-WLANCTL=/sbin/wlanctl-ng
-PRIV_GENERATOR=/sbin/nwepgen
-
-if [ ! -x $WLANCTL ] ; then 
-	exit 0
-fi
-
-# Detect and act only on linux-wlan-ng interfaces
-if [ "$IF_WIRELESS_TYPE" != "wlan-ng" ]; then
-  exit 0
-fi
-
-# Create a lock file; remove on script exit. This is a fairly crummy lock,
-# but all it needs to do is prevent hotplug from calling this script,
-# which may happen when the module is loaded below. Since it should only
-# happen when the module is loaded, I don't need a proper lock.
-if [ -e /var/lock/wlan-$IFACE.lock ]; then
-	exit 0
-fi
-touch /var/lock/wlan-$IFACE.lock
-cleanup () {
-	rm -f /var/lock/wlan-$IFACE.lock
-}
-trap cleanup 0
-
-if [ -z "$IF_WIRELESS_MODE" ]; then
-	IF_WIRELESS_MODE="ad_hoc"
-fi
-
-if [ -z "$IF_WLAN_NG_HOSTWEP" ]; then
-	IF_WLAN_NG_HOSTWEP=false
-fi
-
-if [ -z "$IF_WLAN_NG_DEFAULT_KEY_ID" ]; then
-	IF_WLAN_NG_DEFAULT_KEY_ID=0
-fi
-
-if [ -z "$IF_WLAN_NG_EXCLUDE_UNENCRYPTED" ]; then
-	IF_WLAN_NG_EXCLUDE_UNENCRYPTED=true
-fi
-
-if [ -z "$IF_WLAN_NG_PRIV_KEY128" ]; then
-	IF_WLAN_NG_PRIV_KEY128=false
-fi
-
-if [ -z "$IF_WLAN_NG_BCINT" ]; then
-	IF_WLAN_NG_BCINT=100
-fi
-
-if [ -z "$IF_WLAN_NG_BASICRATES" ]; then
-	IF_WLAN_NG_BASICRATES="2 4"
-fi
-
-if [ -z "$IF_WLAN_NG_OPRATES" ]; then
-	IF_WLAN_NG_OPRATES="2 4 11 22"
-fi
-
-if [ -z "$IF_WLAN_NG_AUTHTYPE" ]; then
-	IF_WLAN_NG_AUTHTYPE="opensystem"
-fi
-
-if [ -z "$IF_WIRELESS_CHANNEL" ]; then
-	IF_WIRELESS_CHANNEL=1
-fi
-
-if ! modprobe p80211; then
-	echo "Failed to load p80211.o." >&2
-	exit 1
-fi
-
-# NOTE: We don't explicitly insmod the card driver here.  The
-#  best thing to do is to specify an alias in /etc/modules.conf.
-#  Then, the first time we call wlanctl with the named device,
-#  the kernel module autoload stuff will take over.
-#  But, if you prefer, you could modprobe it here.
-
-
-# Bring the card up into an operable state.
-result=`$WLANCTL $IFACE lnxreq_ifstate ifstate=enable`
-if [ $? = 0 ] ; then
-	eval $result
-	if [ $resultcode != "success" ]; then
-		echo "Failed to enable the device, resultcode=" $resultcode "." >&2
-		exit 1
-	fi
-else
-	echo "Failed to enable the device, exitcode=" $? "." >&2
-	exit 1
-fi
-
-# Set user-specified MIB items.
-for i in $IF_WLAN_NG_USER_MIBS; do
-	result=`$WLANCTL $IFACE dot11req_mibset "mibattribute=$i"`
-
-	if [ $? = 0 ] ; then
-		eval $result
-		if [ $resultcode != "success" ] ; then
-			echo "Failed to set user MIB $i." >&2
-			exit 1
-		fi
-	else
-		echo "Failed to set user MIB $i." >&2
-		exit 1
-	fi
-done
-
-if [ "$IF_WIRELESS_ENC" = "on" ]; then
-	# Set up WEP.
-	result=`$WLANCTL $IFACE dot11req_mibget mibattribute=dot11PrivacyOptionImplemented`
-	if [ $? = 0 ] ; then
-		eval $result
-		eval $mibattribute
-	else
-		echo "mibget failed." >&2
-		exit 1
-	fi
-	
-	if [ "$dot11PrivacyOptionImplemented" != "true" ]; then
-		echo "Cannot enable privacy, dot11PrivacyOptionImplemented=$dot11PrivacyOptionImplemented." >&2
-		exit 1
-	fi
-
-	$WLANCTL $IFACE lnxreq_hostwep decrypt=$IF_WLAN_NG_HOSTWEP encrypt=$IF_WLAN_NG_HOSTWEP >/dev/null
-	
-	$WLANCTL $IFACE dot11req_mibset \
-		mibattribute=dot11WEPDefaultKeyID=$IF_WLAN_NG_DEFAULT_KEY_ID \
-             >/dev/null
-	
-	$WLANCTL $IFACE dot11req_mibset \
-		mibattribute=dot11ExcludeUnencrypted=$IF_WLAN_NG_EXCLUDE_UNENCRYPTED \
-            >/dev/null
-
-	$WLANCTL $IFACE dot11req_mibset \
-		mibattribute=dot11PrivacyInvoked=true >/dev/null
-
-	if [ -e "$IF_WLAN_NG_KEYFILE" ]; then
-		IF_WLAN_NG_PRIV_GENSTR=`cat $IF_WLAN_NG_KEYFILE`
-	fi
-	if [ ! -z "$IF_WLAN_NG_PRIV_GENSTR" ]; then
-		if [ "$IF_WLAN_NG_PRIV_KEY128" = "false" ]; then
-			keys=`$PRIV_GENERATOR "$IF_WLAN_NG_PRIV_GENSTR" 5`
-		else
-			keys=`$PRIV_GENERATOR "$IF_WLAN_NG_PRIV_GENSTR" 13`
-		fi
-
-		knum=0
-		for i in $keys; do
-			$WLANCTL $IFACE dot11req_mibset \
-				mibattribute=dot11WEPDefaultKey$knum=$i \
-                             >/dev/null
-			knum=$(expr $knum + 1)
-		done
-	else
-		$WLANCTL $IFACE dot11req_mibset \
-			mibattribute=dot11WEPDefaultKey0=$IF_WLAN_NG_KEY0 \
-		     >/dev/null
-		$WLANCTL $IFACE dot11req_mibset \
-			mibattribute=dot11WEPDefaultKey1=$IF_WLAN_NG_KEY1 \
-		     >/dev/null
-		$WLANCTL $IFACE dot11req_mibset \
-			mibattribute=dot11WEPDefaultKey2=$IF_WLAN_NG_KEY2 \
-		     >/dev/null
-		$WLANCTL $IFACE dot11req_mibset \
-			mibattribute=dot11WEPDefaultKey3=$IF_WLAN_NG_KEY3 \
-		     >/dev/null
-	fi
-fi
-	
-# MAC startup
-if [ "$IF_WIRELESS_MODE" = "ad_hoc" ] || 
-   [ "$IF_WIRELESS_MODE" = "ad-hoc" ]; then
-	startcmd="$WLANCTL $IFACE dot11req_start "
-	startcmd="$startcmd ssid=$IF_WIRELESS_ESSID"
-	startcmd="$startcmd bsstype=independent"
-	startcmd="$startcmd beaconperiod=$IF_WLAN_NG_BCINT"
-	startcmd="$startcmd dtimperiod=3"
-	startcmd="$startcmd cfpollable=false"
-	startcmd="$startcmd cfpollreq=false"
-	startcmd="$startcmd cfpperiod=3"
-	startcmd="$startcmd cfpmaxduration=100"
-	startcmd="$startcmd probedelay=100"
-	startcmd="$startcmd dschannel=$IF_WIRELESS_CHANNEL"
-	j=1
-	for i in $IF_WLAN_NG_BASICRATES; do
-		startcmd="$startcmd basicrate$j=$i"
-		j=$(expr $j + 1)
-	done
-	j=1
-	for i in $IF_WLAN_NG_OPRATES; do
-		startcmd="$startcmd operationalrate$j=$i"
-		j=$(expr $j + 1)
-	done
-
-	results=`$startcmd`
-	if [ $? = 0 ]; then 
-		eval $results
-		if [ $resultcode != "success" ] ; then
-			echo "IBSS not started, resultcode=$resultcode" >&2
-			exit 1
-		fi
-	else
-		echo FAILED: $startcmd >&2
-		exit 1
-	fi
-else
-	# Infrastructure mode.
-	results=`$WLANCTL $IFACE lnxreq_autojoin \
-		"ssid=$IF_WIRELESS_ESSID" \
-		authtype=$IF_WLAN_NG_AUTHTYPE | sed 's/\([^=]*\)=\(.*\)/\1="\2"/'`
-	if [ $? = 0 ]; then
-		eval $results
-		if [ ${resultcode:-"failure"} != "success" ]; then
-			echo 'error: Autojoin indicated failure!' >&2
-			exit 1
-		fi
-	fi
-fi
diff --git a/wlan-ng/files/resume b/wlan-ng/files/resume
deleted file mode 100644
index f875939da6..0000000000
--- a/wlan-ng/files/resume
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# This script is run on resume to force a down and up of any linux-wlanng
-# iterfaces. Otherwise they could get into a weird state.
-IFACES=$(ifconfig | grep -B 1 ^wlan | cut -d ' ' -f 1)
-for iface in $IFACES; do
-	echo down $ifcase >>/tmp/log
-	ifdown $iface || ifconfig $iface down
-done
-
-rmmod prism2_pci 2>/dev/null
-rmmod prism2_usb 2>/dev/null
-rmmod prism2_cs 2>/dev/null
-rmmod prism2_plx 2>/dev/null
-rmmod p80211 2>/dev/null
-
-# There is a race here for some reason.
-sleep 2
-
-for iface in $IFACES; do
-	ifup $iface
-done
-
diff --git a/wlan-ng/files/scripts-makefile-hostcc.diff b/wlan-ng/files/scripts-makefile-hostcc.diff
deleted file mode 100644
index 6f0fc5b61c..0000000000
--- a/wlan-ng/files/scripts-makefile-hostcc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Makefile.o	2004-10-06 10:16:13.271421032 +0200
-+++ scripts/Makefile	2004-10-06 10:16:34.136249096 +0200
-@@ -24,7 +24,7 @@
- 		exit 1;\
- 	fi
- 
--	$(CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version
-+	$(BUILD_CC) -I$(KERNEL_SOURCE)/include get_version.c -o get_version
- 
- get_options:
- 	$(MAKE) -f $(CURR_DIR)/Makefile.get_options -C $(KERNEL_SOURCE) get_version_target
diff --git a/wlan-ng/files/usbctl b/wlan-ng/files/usbctl
deleted file mode 100644
index e69de29bb2..0000000000
--- a/wlan-ng/files/usbctl
+++ /dev/null
diff --git a/wlan-ng/files/version.h b/wlan-ng/files/version.h
deleted file mode 100644
index 8f884dcb47..0000000000
--- a/wlan-ng/files/version.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _WLAN_VERSION_H
-#define _WLAN_VERSION_H
-#ifndef KERNEL_VERSION
-#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#endif
-
-/* WLAN_HOSTIF (generally set on the command line, not detected) */
-#define WLAN_PCMCIA                     1
-#define WLAN_ISA                        2
-#define WLAN_PCI                        3
-#define WLAN_USB                        4
-#define WLAN_PLX                        5
-#define WLAN_SLAVE                      6
-#define WLAN_RELEASE    "0.2.1-pre21"
-#define WLAN_RELEASE_CODE 0x000201
-#define WLAN_BUILD_DATE "Yesterday Night"
-
-#endif
-
diff --git a/wlan-ng/files/wlan-ng.modutils b/wlan-ng/files/wlan-ng.modutils
deleted file mode 100644
index 010e20d375..0000000000
--- a/wlan-ng/files/wlan-ng.modutils
+++ /dev/null
@@ -1 +0,0 @@
-alias wlan0 prism2_usb
diff --git a/wlan-ng/files/wlan.agent b/wlan-ng/files/wlan.agent
deleted file mode 100644
index 945d646984..0000000000
--- a/wlan-ng/files/wlan.agent
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# p80211/wlan hotplug policy agent.
-#
-# wlan hotplug params include:
-#	
-#	ACTION=%s [register|remove|shutdown|startup|suspend|resume]
-#	INTERFACE=%s
-#       NSDNAME=%s
-#
-
-cd /etc/hotplug
-# must have ./ here or busybox shell barfs
-. ./hotplug.functions
-
-#DEBUG=yes export DEBUG
-
-if [ "$INTERFACE" = "" ]; then
-    mesg Bad WLAN invocation: \$INTERFACE is not set
-    exit 1
-fi
-
-if [ "$NSDNAME" = "" ]; then
-    mesg Bad WLAN invocation: \$NSDNAME is not set
-    exit 1
-fi
-
-debug_mesg WLAN $ACTION on $INTERFACE \($NSDNAME\)
-
-if [ "$NSDNAME" = "prism2_cs" ] ; then
-    mesg "WLAN Hotplug bypassed for pcmcia"
-    exit 0
-fi
-
-# load up the shared scripts
-if [ ! -f /etc/wlan/shared ] ; then
-    mesg "/etc/wlan/shared not present, aborting"
-    exit 1
-fi
-
-ECHO=mesg
-. /etc/wlan/shared
-
-case $ACTION in
-'register'|'resume')
-	eval 'WLAN_ENABLE=$ENABLE_'$INTERFACE
-	if ! is_true $WLAN_ENABLE ; then
-	    mesg "WLAN $ACTION - interface $INTERFACE not enabled, aborting"
-	    exit 1
-	fi
-	debug_mesg WLAN $INTERFACE registered.
-	wlan_bring_it_up $INTERFACE
-	if [ $? = 0 ] ; then
-	    mesg WLAN $INTERFACE brought up successfully.
-		if [ -x /etc/wlan/network ] ; then
-			mesg "WLAN bringing up layer 3+ with /etc/wlan/network"
-			/etc/wlan/network start $INTERFACE
-		elif [ -x /etc/wlan/pre-ifup ] ; then
-			# pre-ifup is presumed to call ifup if it
-			#  wants to...it may choose to skip it.
-			mesg "WLAN bringing up layer 3+ with /etc/wlan/pre-ifup"
-			/etc/wlan/pre-ifup $INTERFACE
-		else
-			mesg "WLAN bringing up layer 3+ with /sbin/ifup"
-			/sbin/ifup $INTERFACE
-		fi
-	else
-	    mesg WLAN Could not bring up $INTERFACE
-		 exit 1
-	fi
-	# eventually invoke net.agent on $INTERFACE w/ REGISTER
-;;
-'remove'|'suspend')
-	debug_mesg WLAN $INTERFACE removed.
-	eval 'WLAN_ENABLE=$ENABLE_'$INTERFACE
-	if ! is_true $WLAN_ENABLE ; then
-	    mesg "WLAN $ACTION - interface $INTERFACE not enabled, aborting"
-	    exit 1
-	fi
-	if [ -x /etc/wlan/network ] ; then
-		mesg "WLAN taking down layer 3+ with /etc/wlan/network"
-		/etc/wlan/network stop $INTERFACE
-	elif [ -x /etc/wlan/post-ifdown ] ; then
-		# post-ifdown is presumed to call ifdown if it
-		#  wants to...it may choose to skip it.
-		mesg "WLAN taking down layer 3+ with /etc/wlan/post-ifdown"
-		/etc/wlan/post-ifdown $INTERFACE
-	else
-		mesg "WLAN taking down layer 3+ with /sbin/ifdown"
-		/sbin/ifdown $INTERFACE
-	fi
-	wlan_disable $INTERFACE
-;;
-'startup')
-	# kick off wland.
-	debug_mesg WLAN p80211 starting!
-	start_wland
-;;
-'shutdown')
-	debug_mesg WLAN p80211 shutting down!
-	stop_wland
-;;
-*)
-    debug_mesg WLAN $ACTION event not supported
-    exit 1 ;;
-
-esac