From c2df3469a8065d500141f10337b27ac2da6d745b Mon Sep 17 00:00:00 2001
From: agb <agb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 22 May 2009 07:19:58 +0000
Subject: [mac80211] update compat-wireless to 2009-05-21
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15976 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../mac80211/patches/007-remove_unused_stuff.patch | 67 ++++++++++++++++------
.../401-ath9k-dont-register-leds-on-ar9100.patch | 4 +-
.../patches/540-b43-Add-fw-capabilities.patch | 10 ++--
3 files changed, 57 insertions(+), 24 deletions(-)
(limited to 'package/mac80211/patches')
diff --git a/package/mac80211/patches/007-remove_unused_stuff.patch b/package/mac80211/patches/007-remove_unused_stuff.patch
index e22b91f1d..e5878f6d2 100644
--- a/package/mac80211/patches/007-remove_unused_stuff.patch
+++ b/package/mac80211/patches/007-remove_unused_stuff.patch
@@ -146,7 +146,7 @@
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2400PCI=m
-@@ -227,16 +227,16 @@ CONFIG_RT61PCI=m
+@@ -227,24 +227,24 @@ CONFIG_RT61PCI=m
NEED_RT2X00_FIRMWARE=y
endif
@@ -161,13 +161,23 @@
endif
## end of PCI
+ ifneq ($(CONFIG_PCMCIA),)
+
+-CONFIG_LIBERTAS_CS=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_CS=m
++# NEED_LIBERTAS=y
+
+ endif
+ ## end of PCMCIA
+
# This is required for some cards
-CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93CX6=m
# USB Drivers
ifneq ($(CONFIG_USB),)
-@@ -250,21 +250,21 @@ CONFIG_ZD1211RW=m
+@@ -258,21 +258,21 @@ CONFIG_ZD1211RW=m
# is only wireless RNDIS chip known to date.
# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
# it also requires new RNDIS_HOST and CDC_ETHER modules which we add
@@ -196,7 +206,40 @@
endif
# RT2500USB does not require firmware
-@@ -306,20 +306,20 @@ CONFIG_ATH_COMMON=m
+@@ -286,24 +286,24 @@ CONFIG_RT73USB=m
+ NEED_RT2X00_FIRMWARE=y
+ endif
+
+-CONFIG_LIBERTAS_THINFIRM_USB=m
+-CONFIG_LIBERTAS_USB=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_THINFIRM_USB=m
++# CONFIG_LIBERTAS_USB=m
++# NEED_LIBERTAS=y
+
+ endif # end of USB driver list
+
+ ifneq ($(CONFIG_SPI_MASTER),)
+
+-CONFIG_WL12XX=m
+-CONFIG_LIBERTAS_SPI=m
+-NEED_LIBERTAS=y
++# CONFIG_WL12XX=m
++# CONFIG_LIBERTAS_SPI=m
++# NEED_LIBERTAS=y
+
+ endif # end of SPI driver list
+
+ ifneq ($(CONFIG_MMC),)
+
+-CONFIG_LIBERTAS_SDIO=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_SDIO=m
++# NEED_LIBERTAS=y
+
+ endif # end of SDIO driver list
+
+@@ -333,13 +333,13 @@ CONFIG_ATH_COMMON=m
# Sonics Silicon Backplane
@@ -208,19 +251,9 @@
+# CONFIG_SSB_SPROM=y
# CONFIG_SSB_DEBUG=y
- ifneq ($(CONFIG_USB),)
- ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
--CONFIG_LIBERTAS_USB=m
--NEED_LIBERTAS=y
-+# CONFIG_LIBERTAS_USB=m
-+# NEED_LIBERTAS=y
- endif
- endif
- ifneq ($(CONFIG_PCMCIA),)
--CONFIG_LIBERTAS_CS=m
--NEED_LIBERTAS=y
-+# CONFIG_LIBERTAS_CS=m
-+# NEED_LIBERTAS=y
- endif
ifeq ($(NEED_LIBERTAS),y)
+-CONFIG_LIBERTAS_THINFIRM=m
++# CONFIG_LIBERTAS_THINFIRM=m
CONFIG_LIBERTAS=m
+ # CONFIG_LIBERTAS_DEBUG=y
+ endif
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 c5895a361..9dd56f27e 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/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1020,6 +1020,9 @@ static void ath_unregister_led(struct at
+@@ -1034,6 +1034,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;
-@@ -1034,6 +1037,9 @@ static void ath_init_leds(struct ath_sof
+@@ -1048,6 +1051,9 @@ static void ath_init_leds(struct ath_sof
char *trigger;
int ret;
diff --git a/package/mac80211/patches/540-b43-Add-fw-capabilities.patch b/package/mac80211/patches/540-b43-Add-fw-capabilities.patch
index c2320c697..79ff643fb 100644
--- a/package/mac80211/patches/540-b43-Add-fw-capabilities.patch
+++ b/package/mac80211/patches/540-b43-Add-fw-capabilities.patch
@@ -122,7 +122,7 @@ and automagic QoS-disabling.
} else {
b43info(dev->wl, "Loading firmware version %u.%u "
"(20%.2i-%.2i-%.2i %.2i:%.2i:%.2i)\n",
-@@ -3629,7 +3658,7 @@ static int b43_op_set_key(struct ieee802
+@@ -3627,7 +3656,7 @@ static int b43_op_set_key(struct ieee802
if (!dev || b43_status(dev) < B43_STAT_INITIALIZED)
goto out_unlock;
@@ -131,7 +131,7 @@ and automagic QoS-disabling.
/* We don't have firmware for the crypto engine.
* Must use software-crypto. */
err = -EOPNOTSUPP;
-@@ -4737,6 +4766,7 @@ static int b43_wireless_init(struct ssb_
+@@ -4735,6 +4764,7 @@ static int b43_wireless_init(struct ssb_
b43err(NULL, "Could not allocate ieee80211 device\n");
goto out;
}
@@ -139,7 +139,7 @@ and automagic QoS-disabling.
/* fill hw info */
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
-@@ -4750,7 +4780,8 @@ static int b43_wireless_init(struct ssb_
+@@ -4748,7 +4778,8 @@ static int b43_wireless_init(struct ssb_
BIT(NL80211_IFTYPE_WDS) |
BIT(NL80211_IFTYPE_ADHOC);
@@ -149,7 +149,7 @@ and automagic QoS-disabling.
hw->max_rates = 2;
SET_IEEE80211_DEV(hw, dev->dev);
if (is_valid_ether_addr(sprom->et1mac))
-@@ -4758,9 +4789,7 @@ static int b43_wireless_init(struct ssb_
+@@ -4756,9 +4787,7 @@ static int b43_wireless_init(struct ssb_
else
SET_IEEE80211_PERM_ADDR(hw, sprom->il0mac);
@@ -160,7 +160,7 @@ and automagic QoS-disabling.
wl->hw = hw;
spin_lock_init(&wl->irq_lock);
rwlock_init(&wl->tx_lock);
-@@ -4826,8 +4855,13 @@ static void b43_remove(struct ssb_device
+@@ -4824,8 +4853,13 @@ static void b43_remove(struct ssb_device
cancel_work_sync(&wldev->restart_work);
B43_WARN_ON(!wl);
--
cgit v1.2.3