1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 22:06:31 +02:00

[mac80211] update compat-wireless to 2009-05-21

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15976 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
agb 2009-05-22 07:19:58 +00:00
parent a46694e6d0
commit c2df3469a8
4 changed files with 59 additions and 26 deletions

View File

@ -17,12 +17,12 @@ ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_23)$(CONFIG_LINUX_2_6_24)$(CONFI
PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c
PATCH_DIR:=./patches-old PATCH_DIR:=./patches-old
else else
PKG_VERSION:=2009-05-08 PKG_VERSION:=2009-05-21
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/05 \ http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/05 \
http://wireless.kernel.org/download/compat-wireless-2.6 http://wireless.kernel.org/download/compat-wireless-2.6
PKG_MD5SUM:=9e973ca21e20e51f0a3c215c980b1f55 PKG_MD5SUM:=9d15b1d02c7ab48e96ec2f3f9b336e66
endif endif
PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2

View File

@ -146,7 +146,7 @@
CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2400PCI=m CONFIG_RT2400PCI=m
@@ -227,16 +227,16 @@ CONFIG_RT61PCI=m @@ -227,24 +227,24 @@ CONFIG_RT61PCI=m
NEED_RT2X00_FIRMWARE=y NEED_RT2X00_FIRMWARE=y
endif endif
@ -161,13 +161,23 @@
endif endif
## end of PCI ## 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 # This is required for some cards
-CONFIG_EEPROM_93CX6=m -CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93CX6=m
# USB Drivers # USB Drivers
ifneq ($(CONFIG_USB),) 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. # is only wireless RNDIS chip known to date.
# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER # 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 # it also requires new RNDIS_HOST and CDC_ETHER modules which we add
@ -196,7 +206,40 @@
endif endif
# RT2500USB does not require firmware # 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 # Sonics Silicon Backplane
@ -208,19 +251,9 @@
+# CONFIG_SSB_SPROM=y +# CONFIG_SSB_SPROM=y
# CONFIG_SSB_DEBUG=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) ifeq ($(NEED_LIBERTAS),y)
-CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM=m
CONFIG_LIBERTAS=m CONFIG_LIBERTAS=m
# CONFIG_LIBERTAS_DEBUG=y
endif

View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/main.c --- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/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) static void ath_deinit_leds(struct ath_softc *sc)
{ {
@ -10,7 +10,7 @@
cancel_delayed_work_sync(&sc->ath_led_blink_work); cancel_delayed_work_sync(&sc->ath_led_blink_work);
ath_unregister_led(&sc->assoc_led); ath_unregister_led(&sc->assoc_led);
sc->sc_flags &= ~SC_OP_LED_ASSOCIATED; 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; char *trigger;
int ret; int ret;

View File

@ -122,7 +122,7 @@ and automagic QoS-disabling.
} else { } else {
b43info(dev->wl, "Loading firmware version %u.%u " b43info(dev->wl, "Loading firmware version %u.%u "
"(20%.2i-%.2i-%.2i %.2i:%.2i:%.2i)\n", "(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) if (!dev || b43_status(dev) < B43_STAT_INITIALIZED)
goto out_unlock; goto out_unlock;
@ -131,7 +131,7 @@ and automagic QoS-disabling.
/* We don't have firmware for the crypto engine. /* We don't have firmware for the crypto engine.
* Must use software-crypto. */ * Must use software-crypto. */
err = -EOPNOTSUPP; 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"); b43err(NULL, "Could not allocate ieee80211 device\n");
goto out; goto out;
} }
@ -139,7 +139,7 @@ and automagic QoS-disabling.
/* fill hw info */ /* fill hw info */
hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | 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_WDS) |
BIT(NL80211_IFTYPE_ADHOC); BIT(NL80211_IFTYPE_ADHOC);
@ -149,7 +149,7 @@ and automagic QoS-disabling.
hw->max_rates = 2; hw->max_rates = 2;
SET_IEEE80211_DEV(hw, dev->dev); SET_IEEE80211_DEV(hw, dev->dev);
if (is_valid_ether_addr(sprom->et1mac)) 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 else
SET_IEEE80211_PERM_ADDR(hw, sprom->il0mac); SET_IEEE80211_PERM_ADDR(hw, sprom->il0mac);
@ -160,7 +160,7 @@ and automagic QoS-disabling.
wl->hw = hw; wl->hw = hw;
spin_lock_init(&wl->irq_lock); spin_lock_init(&wl->irq_lock);
rwlock_init(&wl->tx_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); cancel_work_sync(&wldev->restart_work);
B43_WARN_ON(!wl); B43_WARN_ON(!wl);