diff options
| -rw-r--r-- | package/mac80211/Makefile | 9 | ||||
| -rw-r--r-- | package/mac80211/patches/006-disable_ipw2x00_build.patch | 9 | ||||
| -rw-r--r-- | package/mac80211/patches/007-remove_unused_stuff.patch | 6 | ||||
| -rw-r--r-- | package/mac80211/patches/308-rt2x00-uncomment-get_tsf.patch | 40 | ||||
| -rw-r--r-- | package/mac80211/patches/316-rt2x00-Remove-check-for-rf-word-0.patch | 152 | ||||
| -rw-r--r-- | package/mac80211/patches/319-rt2x00-Export-all-register-stats-through-debugfs.patch | 4 | ||||
| -rw-r--r-- | package/mac80211/patches/321-rt2x00-Add-various-new-USB-IDs-for-rt73usb.patch | 39 | ||||
| -rw-r--r-- | package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch | 4 | ||||
| -rw-r--r-- | package/mac80211/patches/402-ath9k-enable-debug.patch | 2 | ||||
| -rw-r--r-- | package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch | 2 | ||||
| -rw-r--r-- | package/mac80211/patches/500-b43-disable_qos_when_openfw.patch (renamed from package/mac80211/patches/500-disable_qos_when_openfw.patch) | 0 |
11 files changed, 18 insertions, 249 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 3fa604083..1aaea3850 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -9,16 +9,17 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -PKG_RELEASE:=2 ifneq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),) - PKG_VERSION:=2009-02-15 + PKG_VERSION:=2009-02-19 + PKG_RELEASE:=1 PKG_SOURCE_URL:= \ http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/02 \ http://wireless.kernel.org/download/compat-wireless-2.6 - PKG_MD5SUM:=65b4c3ccd23aa9fa4604fe63b03cce28 + PKG_MD5SUM:=850c8502203c518f0175fd061bed0ec2 else PKG_VERSION:=2008-08-06 + PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08 PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c PATCH_DIR:=./patches-old @@ -415,7 +416,7 @@ define Build/Prepare -unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT2860FW) $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2 rm -rf $(PKG_BUILD_DIR)/include/linux/ssb - rm $(PKG_BUILD_DIR)/include/net/ieee80211.h + rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h rm $(PKG_BUILD_DIR)/include/net/ieee80211_radiotap.h rm $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h endef diff --git a/package/mac80211/patches/006-disable_ipw2x00_build.patch b/package/mac80211/patches/006-disable_ipw2x00_build.patch index 1a5ae58d3..3a6b4c204 100644 --- a/package/mac80211/patches/006-disable_ipw2x00_build.patch +++ b/package/mac80211/patches/006-disable_ipw2x00_build.patch @@ -1,12 +1,11 @@ --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile -@@ -2,9 +2,6 @@ +@@ -2,8 +2,6 @@ # Makefile for the Linux Wireless network device drivers. # -obj-$(CONFIG_IPW2100) += ipw2x00/ -obj-$(CONFIG_IPW2200) += ipw2x00/ -- - obj-$(CONFIG_B43) += b43/ - obj-$(CONFIG_B43LEGACY) += b43legacy/ - obj-$(CONFIG_ZD1211RW) += zd1211rw/ + + obj-$(CONFIG_AT76C50X_USB) += at76c50x-usb.o + diff --git a/package/mac80211/patches/007-remove_unused_stuff.patch b/package/mac80211/patches/007-remove_unused_stuff.patch index e7ab07469..1e85f5495 100644 --- a/package/mac80211/patches/007-remove_unused_stuff.patch +++ b/package/mac80211/patches/007-remove_unused_stuff.patch @@ -15,7 +15,7 @@ CONFIG_NL80211=y -@@ -133,16 +133,16 @@ CONFIG_IWL3945_LEDS=y +@@ -130,16 +130,16 @@ CONFIG_IWL3945_LEDS=y CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y @@ -35,7 +35,7 @@ # CONFIG_B43LEGACY_RFKILL=y # CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y -@@ -152,17 +152,17 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +@@ -149,17 +149,17 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_PIO_MODE is not set # The Intel ipws @@ -61,7 +61,7 @@ # CONFIG_IPW2200_DEBUG is not set # The above enables use a second interface prefixed 'rtap'. # Example usage: -@@ -284,15 +284,15 @@ CONFIG_SSB_SPROM=y +@@ -282,15 +282,15 @@ CONFIG_SSB_SPROM=y ifneq ($(CONFIG_USB),) ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m) CONFIG_LIBERTAS_USB=m diff --git a/package/mac80211/patches/308-rt2x00-uncomment-get_tsf.patch b/package/mac80211/patches/308-rt2x00-uncomment-get_tsf.patch deleted file mode 100644 index de007cea2..000000000 --- a/package/mac80211/patches/308-rt2x00-uncomment-get_tsf.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6ad5c6dd7471b066e5f83aeec3919296c1fd817a Mon Sep 17 00:00:00 2001 -From: Ivo van Doorn <IvDoorn@gmail.com> -Date: Sat, 7 Feb 2009 15:21:48 +0100 -Subject: [PATCH] rt2x00: uncomment get_tsf - -The atomic requirement for get_tsf() has been removed -by mac80211. This means the USB drivers can add support -for the callback function again. - -Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> ---- - drivers/net/wireless/rt2x00/rt73usb.c | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - ---- a/drivers/net/wireless/rt2x00/rt73usb.c -+++ b/drivers/net/wireless/rt2x00/rt73usb.c -@@ -2241,13 +2241,6 @@ static int rt73usb_conf_tx(struct ieee80 - return 0; - } - --#if 0 --/* -- * Mac80211 demands get_tsf must be atomic. -- * This is not possible for rt73usb since all register access -- * functions require sleeping. Untill mac80211 no longer needs -- * get_tsf to be atomic, this function should be disabled. -- */ - static u64 rt73usb_get_tsf(struct ieee80211_hw *hw) - { - struct rt2x00_dev *rt2x00dev = hw->priv; -@@ -2261,9 +2254,6 @@ static u64 rt73usb_get_tsf(struct ieee80 - - return tsf; - } --#else --#define rt73usb_get_tsf NULL --#endif - - static const struct ieee80211_ops rt73usb_mac80211_ops = { - .tx = rt2x00mac_tx, diff --git a/package/mac80211/patches/316-rt2x00-Remove-check-for-rf-word-0.patch b/package/mac80211/patches/316-rt2x00-Remove-check-for-rf-word-0.patch deleted file mode 100644 index f5d8c4e0f..000000000 --- a/package/mac80211/patches/316-rt2x00-Remove-check-for-rf-word-0.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 14aaed532a6d18af35466d8f440e96597a8d203a Mon Sep 17 00:00:00 2001 -From: Ivo van Doorn <IvDoorn@gmail.com> -Date: Sun, 8 Feb 2009 17:05:01 +0100 -Subject: [PATCH] rt2x00: Remove check for rf word 0 - -The only way rf_write() can be called with word 0 is -when the user sends the wrong word index through debugfs. -However the values which are send through debugfs are -validated using the RF_BASE and RF_SIZE macro values, -the most logical solution is to increase RF_BASE with 4 -and decrease RF_SIZE with 4 (RF_SIZE has always been -1 word too big) - -Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> ---- - drivers/net/wireless/rt2x00/rt2400pci.c | 3 --- - drivers/net/wireless/rt2x00/rt2400pci.h | 4 ++-- - drivers/net/wireless/rt2x00/rt2500pci.c | 3 --- - drivers/net/wireless/rt2x00/rt2500pci.h | 4 ++-- - drivers/net/wireless/rt2x00/rt2500usb.c | 3 --- - drivers/net/wireless/rt2x00/rt2500usb.h | 4 ++-- - drivers/net/wireless/rt2x00/rt61pci.c | 3 --- - drivers/net/wireless/rt2x00/rt61pci.h | 4 ++-- - drivers/net/wireless/rt2x00/rt73usb.c | 3 --- - drivers/net/wireless/rt2x00/rt73usb.h | 4 ++-- - 10 files changed, 10 insertions(+), 25 deletions(-) - ---- a/drivers/net/wireless/rt2x00/rt2400pci.c -+++ b/drivers/net/wireless/rt2x00/rt2400pci.c -@@ -114,9 +114,6 @@ static void rt2400pci_rf_write(struct rt - { - u32 reg; - -- if (!word) -- return; -- - mutex_lock(&rt2x00dev->csr_mutex); - - /* ---- a/drivers/net/wireless/rt2x00/rt2400pci.h -+++ b/drivers/net/wireless/rt2x00/rt2400pci.h -@@ -48,8 +48,8 @@ - #define EEPROM_SIZE 0x0100 - #define BBP_BASE 0x0000 - #define BBP_SIZE 0x0020 --#define RF_BASE 0x0000 --#define RF_SIZE 0x0010 -+#define RF_BASE 0x0004 -+#define RF_SIZE 0x000c - - /* - * Number of TX queues. ---- a/drivers/net/wireless/rt2x00/rt2500pci.c -+++ b/drivers/net/wireless/rt2x00/rt2500pci.c -@@ -114,9 +114,6 @@ static void rt2500pci_rf_write(struct rt - { - u32 reg; - -- if (!word) -- return; -- - mutex_lock(&rt2x00dev->csr_mutex); - - /* ---- a/drivers/net/wireless/rt2x00/rt2500pci.h -+++ b/drivers/net/wireless/rt2x00/rt2500pci.h -@@ -59,8 +59,8 @@ - #define EEPROM_SIZE 0x0200 - #define BBP_BASE 0x0000 - #define BBP_SIZE 0x0040 --#define RF_BASE 0x0000 --#define RF_SIZE 0x0014 -+#define RF_BASE 0x0004 -+#define RF_SIZE 0x0010 - - /* - * Number of TX queues. ---- a/drivers/net/wireless/rt2x00/rt2500usb.c -+++ b/drivers/net/wireless/rt2x00/rt2500usb.c -@@ -204,9 +204,6 @@ static void rt2500usb_rf_write(struct rt - { - u16 reg; - -- if (!word) -- return; -- - mutex_lock(&rt2x00dev->csr_mutex); - - /* ---- a/drivers/net/wireless/rt2x00/rt2500usb.h -+++ b/drivers/net/wireless/rt2x00/rt2500usb.h -@@ -59,8 +59,8 @@ - #define EEPROM_SIZE 0x006a - #define BBP_BASE 0x0000 - #define BBP_SIZE 0x0060 --#define RF_BASE 0x0000 --#define RF_SIZE 0x0014 -+#define RF_BASE 0x0004 -+#define RF_SIZE 0x0010 - - /* - * Number of TX queues. ---- a/drivers/net/wireless/rt2x00/rt61pci.c -+++ b/drivers/net/wireless/rt2x00/rt61pci.c -@@ -123,9 +123,6 @@ static void rt61pci_rf_write(struct rt2x - { - u32 reg; - -- if (!word) -- return; -- - mutex_lock(&rt2x00dev->csr_mutex); - - /* ---- a/drivers/net/wireless/rt2x00/rt61pci.h -+++ b/drivers/net/wireless/rt2x00/rt61pci.h -@@ -50,8 +50,8 @@ - #define EEPROM_SIZE 0x0100 - #define BBP_BASE 0x0000 - #define BBP_SIZE 0x0080 --#define RF_BASE 0x0000 --#define RF_SIZE 0x0014 -+#define RF_BASE 0x0004 -+#define RF_SIZE 0x0010 - - /* - * Number of TX queues. ---- a/drivers/net/wireless/rt2x00/rt73usb.c -+++ b/drivers/net/wireless/rt2x00/rt73usb.c -@@ -122,9 +122,6 @@ static void rt73usb_rf_write(struct rt2x - { - u32 reg; - -- if (!word) -- return; -- - mutex_lock(&rt2x00dev->csr_mutex); - - /* ---- a/drivers/net/wireless/rt2x00/rt73usb.h -+++ b/drivers/net/wireless/rt2x00/rt73usb.h -@@ -50,8 +50,8 @@ - #define EEPROM_SIZE 0x0100 - #define BBP_BASE 0x0000 - #define BBP_SIZE 0x0080 --#define RF_BASE 0x0000 --#define RF_SIZE 0x0014 -+#define RF_BASE 0x0004 -+#define RF_SIZE 0x0010 - - /* - * Number of TX queues. diff --git a/package/mac80211/patches/319-rt2x00-Export-all-register-stats-through-debugfs.patch b/package/mac80211/patches/319-rt2x00-Export-all-register-stats-through-debugfs.patch index 63c726f6d..535489185 100644 --- a/package/mac80211/patches/319-rt2x00-Export-all-register-stats-through-debugfs.patch +++ b/package/mac80211/patches/319-rt2x00-Export-all-register-stats-through-debugfs.patch @@ -22,7 +22,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> --- a/drivers/net/wireless/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c -@@ -545,9 +545,9 @@ static struct dentry *rt2x00debug_create +@@ -547,9 +547,9 @@ static struct dentry *rt2x00debug_create return NULL; blob->data = data; @@ -35,7 +35,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> blob->size = strlen(blob->data); return debugfs_create_blob(name, S_IRUSR, intf->driver_folder, blob); -@@ -568,14 +568,27 @@ static struct dentry *rt2x00debug_create +@@ -570,14 +570,27 @@ static struct dentry *rt2x00debug_create return NULL; blob->data = data; diff --git a/package/mac80211/patches/321-rt2x00-Add-various-new-USB-IDs-for-rt73usb.patch b/package/mac80211/patches/321-rt2x00-Add-various-new-USB-IDs-for-rt73usb.patch deleted file mode 100644 index 70fe65e3b..000000000 --- a/package/mac80211/patches/321-rt2x00-Add-various-new-USB-IDs-for-rt73usb.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe9ab0125accc1c16bd3f9f394787656332fc467 Mon Sep 17 00:00:00 2001 -From: Ivo van Doorn <IvDoorn@gmail.com> -Date: Sat, 14 Feb 2009 13:39:14 +0100 -Subject: [PATCH] rt2x00: Add various new USB IDs for rt73usb - -Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> ---- - drivers/net/wireless/rt2x00/rt73usb.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - ---- a/drivers/net/wireless/rt2x00/rt73usb.c -+++ b/drivers/net/wireless/rt2x00/rt73usb.c -@@ -2342,6 +2342,9 @@ static const struct rt2x00_ops rt73usb_o - static struct usb_device_id rt73usb_device_table[] = { - /* AboCom */ - { USB_DEVICE(0x07b8, 0xb21d), USB_DEVICE_DATA(&rt73usb_ops) }, -+ /* Amigo */ -+ { USB_DEVICE(0x148f, 0x9021), USB_DEVICE_DATA(&rt73usb_ops) }, -+ { USB_DEVICE(0x0eb0, 0x9021), USB_DEVICE_DATA(&rt73usb_ops) }, - /* Askey */ - { USB_DEVICE(0x1690, 0x0722), USB_DEVICE_DATA(&rt73usb_ops) }, - /* ASUS */ -@@ -2389,6 +2392,7 @@ static struct usb_device_id rt73usb_devi - { USB_DEVICE(0x0db0, 0xa861), USB_DEVICE_DATA(&rt73usb_ops) }, - { USB_DEVICE(0x0db0, 0xa874), USB_DEVICE_DATA(&rt73usb_ops) }, - /* Ralink */ -+ { USB_DEVICE(0x04bb, 0x093d), USB_DEVICE_DATA(&rt73usb_ops) }, - { USB_DEVICE(0x148f, 0x2573), USB_DEVICE_DATA(&rt73usb_ops) }, - { USB_DEVICE(0x148f, 0x2671), USB_DEVICE_DATA(&rt73usb_ops) }, - /* Qcom */ -@@ -2405,6 +2409,8 @@ static struct usb_device_id rt73usb_devi - /* Planex */ - { USB_DEVICE(0x2019, 0xab01), USB_DEVICE_DATA(&rt73usb_ops) }, - { USB_DEVICE(0x2019, 0xab50), USB_DEVICE_DATA(&rt73usb_ops) }, -+ /* ZyXEL */ -+ { USB_DEVICE(0x0586, 0x3415), USB_DEVICE_DATA(&rt73usb_ops) }, - { 0, } - }; - diff --git a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch index 9fbb3b5ed..ea8e2da17 100644 --- a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch +++ b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c -@@ -1023,6 +1023,9 @@ static void ath_unregister_led(struct at +@@ -1027,6 +1027,9 @@ static void ath_unregister_led(struct at static void ath_deinit_leds(struct ath_softc *sc) { @@ -10,7 +10,7 @@ cancel_delayed_work_sync(&sc->ath_led_blink_work); ath_unregister_led(&sc->assoc_led); sc->sc_flags &= ~SC_OP_LED_ASSOCIATED; -@@ -1037,6 +1040,9 @@ static void ath_init_leds(struct ath_sof +@@ -1041,6 +1044,9 @@ static void ath_init_leds(struct ath_sof char *trigger; int ret; diff --git a/package/mac80211/patches/402-ath9k-enable-debug.patch b/package/mac80211/patches/402-ath9k-enable-debug.patch index cae6fe8a8..f72225e06 100644 --- a/package/mac80211/patches/402-ath9k-enable-debug.patch +++ b/package/mac80211/patches/402-ath9k-enable-debug.patch @@ -8,4 +8,4 @@ +CONFIG_ATH9K_DEBUG=y - CONFIG_IWLWIFI=y + CONFIG_IWLWIFI=m diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch index 342399926..8f41b5b8d 100644 --- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch +++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c -@@ -493,11 +493,18 @@ static int ath9k_hw_init_macaddr(struct +@@ -494,11 +494,18 @@ static int ath9k_hw_init_macaddr(struct ah->macaddr[2 * i] = eeval >> 8; ah->macaddr[2 * i + 1] = eeval & 0xff; } diff --git a/package/mac80211/patches/500-disable_qos_when_openfw.patch b/package/mac80211/patches/500-b43-disable_qos_when_openfw.patch index 9c36390c6..9c36390c6 100644 --- a/package/mac80211/patches/500-disable_qos_when_openfw.patch +++ b/package/mac80211/patches/500-b43-disable_qos_when_openfw.patch |