PKG_NAME:=mac80211
-PKG_VERSION:=2011-03-24
-PKG_RELEASE:=1
+PKG_VERSION:=2011-04-06
+PKG_RELEASE:=2
PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
-PKG_MD5SUM:=f5713fb3ab59bdd3d0ce931b813ef960
+PKG_MD5SUM:=7ef8c2d9ee25af7ed33cf339f2484249
PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
define KernelPackage/rt2800-lib
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +USB_SUPPORT:kmod-rt2x00-usb +TARGET_ramips:kmod-rt2x00-soc +@DRIVER_11N_SUPPORT
+ DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +TARGET_ramips:kmod-rt2x00-soc +@DRIVER_11N_SUPPORT
TITLE+= (rt2800 LIB)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800lib.ko
AUTOLOAD:=$(call AutoLoad,27,rt2800lib)
define KernelPackage/rt2800-pci
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc
+ DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc
TITLE+= (RT2860 PCI)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.ko
AUTOLOAD:=$(call AutoLoad,28,rt2800pci)
define KernelPackage/rt2800-usb
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-crc-ccitt
+ DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-rt2800-lib +kmod-crc-ccitt
TITLE+= (RT2870 USB)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.ko
AUTOLOAD:=$(call AutoLoad,28,rt2800usb)
define KernelPackage/rtl8187
$(call KernelPackage/rtl818x/Default)
- DEPENDS+= @USB_SUPPORT
+ DEPENDS+= @USB_SUPPORT +kmod-usb-core
TITLE+= (RTL8187 USB)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
AUTOLOAD:=$(call AutoLoad,27,rtl8187)
Kernel modules for Hermes based PCMCIA adaptors
endef
+IWL3945_NAME:=iwlwifi-3945-ucode
+IWL3945_VERSION:=15.32.2.9
+IWL3945_MD5SUM:=d99a75ab1305d1532a09471b2f9a547a
+IWL4965_NAME:=iwlwifi-4965-ucode
+IWL4965_VERSION:=228.61.2.24
+IWL4965_MD5SUM:=2531028773cfc22aca5539c734f2a241
+IWL5000_NAME:=iwlwifi-5000-ucode
+IWL5000_VERSION:=8.83.5.1
+IWL5000_MD5SUM:=da82465019b3c7d1ee5156474ab4931d
+IWL5150_NAME:=iwlwifi-5150-ucode
+IWL5150_VERSION:=8.24.2.2
+IWL5150_MD5SUM:=f9cee16e455e8046b1bf62c93f882d5d
+IWL1000_NAME:=iwlwifi-1000-ucode
+IWL1000_VERSION:=39.31.5.1
+IWL1000_MD5SUM:=8098503cb2abcdeffffb3ddd2d8d6f60
+IWL6000_NAME:=iwlwifi-6000-ucode
+IWL6000_VERSION:=9.221.4.1
+IWL6000_MD5SUM:=c132a4c1946a9dbc0c36b41696e5c793
+IWL6050_NAME:=iwlwifi-6050-ucode
+IWL6050_VERSION:=41.28.5.1
+IWL6050_MD5SUM:=cb484a65b9139666d4ddebf60598a87b
+IWL6005_NAME:=iwlwifi-6000g2a-ucode
+IWL6005_VERSION:=17.168.5.2
+IWL6005_MD5SUM:=0b9579f4b8faf51c955295607a8e79a8
+IWL6030_NAME:=iwlwifi-6000g2b-ucode
+IWL6030_VERSION:=17.168.5.2
+IWL6030_MD5SUM:=d87411296b4eeda0c91322228e9f8437
+IWL100_NAME:=iwlwifi-100-ucode
+IWL100_VERSION:=39.31.5.1
+IWL100_MD5SUM:=b686f0ab94888ccca3ce74d2d6ee1133
+
+
+define Download/iwl-fw/Default
+ URL:=http://intellinuxwireless.org/iwlwifi/downloads/
+endef
+
+define Download/iwl3945-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL3945_NAME)-$(IWL3945_VERSION).tgz
+ MD5SUM:=$(IWL3945_MD5SUM)
+endef
+$(eval $(call Download,iwl3945-fw))
+
+define Download/iwl4965-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL4965_NAME)-$(IWL4965_VERSION).tgz
+ MD5SUM:=$(IWL4965_MD5SUM)
+endef
+$(eval $(call Download,iwl4965-fw))
+
+define Download/iwl5000-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL5000_NAME)-$(IWL5000_VERSION).tgz
+ MD5SUM:=$(IWL5000_MD5SUM)
+endef
+$(eval $(call Download,iwl5000-fw))
+
+define Download/iwl5150-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL5150_NAME)-$(IWL5150_VERSION).tgz
+ MD5SUM:=$(IWL5150_MD5SUM)
+endef
+$(eval $(call Download,iwl5150-fw))
+
+define Download/iwl1000-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL1000_NAME)-$(IWL1000_VERSION).tgz
+ MD5SUM:=$(IWL1000_MD5SUM)
+endef
+$(eval $(call Download,iwl1000-fw))
+
+define Download/iwl6000-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL6000_NAME)-$(IWL6000_VERSION).tgz
+ MD5SUM:=$(IWL6000_MD5SUM)
+endef
+$(eval $(call Download,iwl6000-fw))
+
+define Download/iwl6050-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL6050_NAME)-$(IWL6050_VERSION).tgz
+ MD5SUM:=$(IWL6050_MD5SUM)
+endef
+$(eval $(call Download,iwl6050-fw))
+
+define Download/iwl6005-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL6005_NAME)-$(IWL6005_VERSION).tgz
+ MD5SUM:=$(IWL6005_MD5SUM)
+endef
+$(eval $(call Download,iwl6005-fw))
+
+define Download/iwl6030-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL6030_NAME)-$(IWL6030_VERSION).tgz
+ MD5SUM:=$(IWL6030_MD5SUM)
+endef
+$(eval $(call Download,iwl6030-fw))
+
+define Download/iwl100-fw
+ $(call Download/iwl-fw/Default)
+ FILE:=$(IWL100_NAME)-$(IWL100_VERSION).tgz
+ MD5SUM:=$(IWL100_MD5SUM)
+endef
+$(eval $(call Download,iwl100-fw))
+
+define KernelPackage/iwlagn
+ $(call KernelPackage/mac80211/Default)
+ DEPENDS:= +kmod-mac80211
+ TITLE:=Intel AGN Wireless support
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlwifi/iwlagn.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,60,iwlagn)
+ MENU:=1
+endef
+
+define KernelPackage/iwlagn/description
+ iwlagn kernel module for Intel 5000/5150/1000/6000/6050/6005/6030/100 support
+endef
+
+define KernelPackage/iwlagn/config
+ menu "Configuration"
+ depends on PACKAGE_kmod-iwlagn
+
+ config IWL5000_FW
+ bool "Intel 5000 Firmware"
+ default y
+ help
+ Download and install firmware for:
+ Intel 5000 wireless card into /lib/firmware.
+
+ config IWL5150_FW
+ bool "Intel 5150 Firmware"
+ default y
+ help
+ Download and install firmware for:
+ Intel 5150 wireless card into /lib/firmware.
+
+ config IWL1000_FW
+ bool "Intel 1000 Firmware"
+ default y
+ help
+ Download and install firmware for:
+ Intel 1000 wireless card into /lib/firmware.
+
+ config IWL6000_FW
+ bool "Intel 6000 Firmware"
+ default y
+ help
+ Download and install firmware for:
+ Intel 6000 wireless card into /lib/firmware.
+
+ config IWL6050_FW
+ bool "Intel 6050 Firmware"
+ default y
+ help
+ Download and install firmware for:
+ Intel 6050 wireless card into /lib/firmware.
+
+ config IWL6005_FW
+ bool "Intel 6005 Firmware"
+ default y
+ help
+ Download and install firmware for:
+ Intel 6005 wireless card into /lib/firmware.
+
+ config IWL6030_FW
+ bool "Intel 6030 Firmware"
+ default y
+ help
+ Download and install firmware for:
+ Intel 6030 wireless card into /lib/firmware.
+
+ config IWL100_FW
+ bool "Intel 100 Firmware"
+ default y
+ help
+ Download and install firmware for:
+ Intel 100 wireless card into /lib/firmware.
+
+ endmenu
+endef
+
+define KernelPackage/iwl-legacy
+ $(call KernelPackage/mac80211/Default)
+ DEPENDS:= +kmod-mac80211
+ TITLE:=Intel legacy Wireless support
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl-legacy.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,60,iwl-legacy)
+endef
+
+define KernelPackage/iwl-legacy/description
+ iwl-legacy kernel module for legacy Intel wireless support
+endef
+
+define KernelPackage/iwl3945
+ $(call KernelPackage/mac80211/Default)
+ DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy
+ TITLE:=Intel iwl3945 Wireless support
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl3945.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,61,iwl3945)
+endef
+
+define KernelPackage/iwl3945/description
+ iwl3945 kernel module for Intel 3945 support
+endef
+
+define KernelPackage/iwl4965
+ $(call KernelPackage/mac80211/Default)
+ DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy
+ TITLE:=Intel iwl4965 Wireless support
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl4965.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,61,iwl4965)
+endef
+
+define KernelPackage/iwl4965/description
+ iwl4965 kernel module for Intel 4965 support
+endef
+
define KernelPackage/mwl8k
$(call KernelPackage/mac80211/Default)
$(if $(CONFIG_PCI),-DCONFIG_B43_PCI_AUTOSELECT -DCONFIG_B43_PCICORE_AUTOSELECT) \
$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS -DCONFIG_AR9170_LEDS) \
-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \
- $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS) \
+ $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS -DCONFIG_ATH9K_HTC_DEBUGFS) \
$(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG -DCONFIG_ATH9K_PKTLOG -DCONFIG_ATH5K_DEBUG) \
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
-DCONFIG_MAC80211_RC_MINSTREL_HT \
$(if $(CONFIG_PACKAGE_kmod-rt2x00-pci),-DCONFIG_RT2X00_LIB_PCI) \
$(if $(CONFIG_PACKAGE_kmod-rt2x00-usb),-DCONFIG_RT2X00_LIB_USB) \
$(if $(CONFIG_PACKAGE_kmod-rt2x00-soc),-DCONFIG_RT2X00_LIB_SOC) \
- $(if $(CONFIG_TARGET_atheros),-DCONFIG_ATH5K_AHB,-DCONFIG_ATH5K_PCI)
+ $(if $(CONFIG_TARGET_atheros),-DCONFIG_ATH5K_AHB,-DCONFIG_ATH5K_PCI) \
+ $(if $(CONFIG_PACKAGE_kmod-iwl3945),-DCONFIG_COMPAT_IWL3945) \
+ $(if $(CONFIG_PACKAGE_kmod-iwl4965),-DCONFIG_COMPAT_IWL4965)
MAKE_OPTS:= \
CROSS_COMPILE="$(KERNEL_CROSS)" \
CONFIG_LIB80211_CRYPT_WEP= \
CONFIG_LIB80211_CRYPT_CCMP= \
CONFIG_LIB80211_CRYPT_TKIP= \
- CONFIG_COMPAT_IWLWIFI= \
- CONFIG_IWLWIFI_LEGACY= \
- CONFIG_IWLAGN= \
+ CONFIG_IWLAGN=$(if $(CONFIG_PACKAGE_kmod-iwlagn),m) \
+ CONFIG_IWLWIFI_LEGACY=$(if $(CONFIG_PACKAGE_kmod-iwl-legacy),m) \
+ CONFIG_COMPAT_IWL4965=$(if $(CONFIG_PACKAGE_kmod-iwl4965),m) \
+ CONFIG_IWL3945=$(if $(CONFIG_PACKAGE_kmod-iwl3945),m) \
CONFIG_MWL8K=$(if $(CONFIG_PACKAGE_kmod-mwl8k),m) \
CONFIG_ATMEL= \
CONFIG_PCMCIA_ATMEL= \
CONFIG_AR9170_USB=$(if $(CONFIG_PACKAGE_kmod-ar9170),m) \
CONFIG_AR9170_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_IWM= \
+ CONFIG_MWIFIEX= \
CONFIG_MAC80211_RC_MINSTREL_HT=y \
MADWIFI= \
- OLD_IWL= \
KLIB_BUILD="$(LINUX_DIR)" \
MODPROBE=: \
KLIB=$(TARGET_MODULES_DIR) \
-unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT2870FW)
$(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2100_NAME)-$(IPW2100_VERSION).tgz
$(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL3945_NAME)-$(IWL3945_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL4965_NAME)-$(IWL4965_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL5000_NAME)-$(IWL5000_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL5150_NAME)-$(IWL5150_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL1000_NAME)-$(IWL1000_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6000_NAME)-$(IWL6000_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6050_NAME)-$(IWL6050_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6005_NAME)-$(IWL6005_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL6030_NAME)-$(IWL6030_VERSION).tgz
+ $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IWL100_NAME)-$(IWL100_VERSION).tgz
$(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2
rm -rf $(PKG_BUILD_DIR)/include/linux/ssb
rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h
$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware
endef
+define KernelPackage/iwlagn/install
+ $(INSTALL_DIR) $(1)/lib/firmware
+ifneq ($(CONFIG_IWL5000_FW),)
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL5000_NAME)-$(IWL5000_VERSION)/iwlwifi-5000-*.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL5150_FW),)
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL5150_NAME)-$(IWL5150_VERSION)/iwlwifi-5150-*.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL1000_FW),)
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL1000_NAME)-$(IWL1000_VERSION)/iwlwifi-1000-*.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL6000_FW),)
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6000_NAME)-$(IWL6000_VERSION)/iwlwifi-6000-*.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL6050_FW),)
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6050_NAME)-$(IWL6050_VERSION)/iwlwifi-6050-*.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL6005_FW),)
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6005_NAME)-$(IWL6005_VERSION)/iwlwifi-6000g2a-*.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL6030_FW),)
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL6030_NAME)-$(IWL6030_VERSION)/iwlwifi-6000g2b-*.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL100_FW),)
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL100_NAME)-$(IWL100_VERSION)/iwlwifi-100-*.ucode $(1)/lib/firmware
+endif
+endef
+
+define KernelPackage/iwl3945/install
+ $(INSTALL_DIR) $(1)/lib/firmware
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL3945_NAME)-$(IWL3945_VERSION)/iwlwifi-3945-*.ucode $(1)/lib/firmware
+endef
+
+define KernelPackage/iwl4965/install
+ $(INSTALL_DIR) $(1)/lib/firmware
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IWL4965_NAME)-$(IWL4965_VERSION)/iwlwifi-4965-*.ucode $(1)/lib/firmware
+endef
+
define Build/b43-common
tar xjf "$(DL_DIR)/$(PKG_B43_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)"
$(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)" \
$(eval $(call KernelPackage,net-libipw))
$(eval $(call KernelPackage,net-ipw2100))
$(eval $(call KernelPackage,net-ipw2200))
+$(eval $(call KernelPackage,iwlagn))
+$(eval $(call KernelPackage,iwl-legacy))
+$(eval $(call KernelPackage,iwl4965))
+$(eval $(call KernelPackage,iwl3945))
$(eval $(call KernelPackage,mwl8k))
$(eval $(call KernelPackage,net-hermes))
$(eval $(call KernelPackage,net-hermes-pci))
ifeq ($(CONFIG_MAC80211),y)
$(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
-@@ -623,10 +623,10 @@ endif #CONFIG_COMPAT_KERNEL_27
+@@ -626,10 +626,10 @@ endif #CONFIG_COMPAT_KERNEL_27
# We need the backported rfkill module on kernel < 2.6.31.
# In more recent kernel versions use the in kernel rfkill module.
ifdef CONFIG_COMPAT_KERNEL_31
@@ -204,7 +204,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
endif #CONFIG_WIRELESS_EXT
- ifneq ($(CONFIG_STAGING),)
-- CONFIG_COMPAT_STAGING=m
-+# CONFIG_COMPAT_STAGING=m
- endif
+ ifdef CONFIG_STAGING
+-CONFIG_COMPAT_STAGING=y
++# CONFIG_COMPAT_STAGING=y
+ endif #CONFIG_STAGING
# mac80211 test driver
@@ -342,13 +342,13 @@ endif #CONFIG_CRC_ITU_T
--- a/compat/compat-2.6.39.c
+++ b/compat/compat-2.6.39.c
-@@ -12,6 +12,7 @@
+@@ -11,6 +11,7 @@
+ #include <linux/compat.h>
#include <linux/tty.h>
- #include <linux/sched.h>
+#ifdef CONFIG_COMPAT_BLUETOOTH
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
/*
* Termios Helper Methods
-@@ -111,4 +112,4 @@ int tty_set_termios(struct tty_struct *t
+@@ -110,4 +111,4 @@ int tty_set_termios(struct tty_struct *t
}
EXPORT_SYMBOL_GPL(tty_set_termios);
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) */
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1048,6 +1048,8 @@ static int ath9k_start(struct ieee80211_
- "Starting driver with initial channel: %d MHz\n",
- curchan->center_freq);
+@@ -324,7 +324,6 @@ static void ath_paprd_activate(struct at
+ if (!caldata || !caldata->paprd_done)
+ return;
+
+- ath9k_ps_wakeup(sc);
+ ar9003_paprd_enable(ah, false);
+ for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+ if (!(common->tx_chainmask & BIT(chain)))
+@@ -334,7 +333,6 @@ static void ath_paprd_activate(struct at
+ }
+
+ ar9003_paprd_enable(ah, true);
+- ath9k_ps_restore(sc);
+ }
+
+ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
+@@ -554,8 +552,11 @@ set_timer:
+ if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) {
+ if (!ah->caldata->paprd_done)
+ ieee80211_queue_work(sc->hw, &sc->paprd_work);
+- else if (!ah->paprd_table_write_done)
++ else if (!ah->paprd_table_write_done) {
++ ath9k_ps_wakeup(sc);
+ ath_paprd_activate(sc);
++ ath9k_ps_restore(sc);
++ }
+ }
+ }
+
+@@ -1376,7 +1377,6 @@ static void ath9k_calculate_summary_stat
+
+ ath9k_calculate_iter_data(hw, vif, &iter_data);
+
+- ath9k_ps_wakeup(sc);
+ /* Set BSSID mask. */
+ memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
+ ath_hw_setbssidmask(common);
+@@ -1411,7 +1411,6 @@ static void ath9k_calculate_summary_stat
+ }
+
+ ath9k_hw_set_interrupts(ah, ah->imask);
+- ath9k_ps_restore(sc);
+
+ /* Set up ANI */
+ if ((iter_data.naps + iter_data.nadhocs) > 0) {
+@@ -1457,6 +1456,7 @@ static int ath9k_add_interface(struct ie
+ struct ath_vif *avp = (void *)vif->drv_priv;
+ int ret = 0;
+ ath9k_ps_wakeup(sc);
-+
mutex_lock(&sc->mutex);
- /* setup initial channel */
-@@ -1143,6 +1145,8 @@ static int ath9k_start(struct ieee80211_
- mutex_unlock:
+ switch (vif->type) {
+@@ -1503,6 +1503,7 @@ static int ath9k_add_interface(struct ie
+ ath9k_do_vif_add_setup(hw, vif);
+ out:
mutex_unlock(&sc->mutex);
++ ath9k_ps_restore(sc);
+ return ret;
+ }
+
+@@ -1517,6 +1518,7 @@ static int ath9k_change_interface(struct
+ ath_dbg(common, ATH_DBG_CONFIG, "Change Interface\n");
+ mutex_lock(&sc->mutex);
++ ath9k_ps_wakeup(sc);
+
+ /* See if new interface type is valid. */
+ if ((new_type == NL80211_IFTYPE_ADHOC) &&
+@@ -1546,6 +1548,7 @@ static int ath9k_change_interface(struct
+
+ ath9k_do_vif_add_setup(hw, vif);
+ out:
+ ath9k_ps_restore(sc);
-+
- return r;
+ mutex_unlock(&sc->mutex);
+ return ret;
}
+@@ -1558,6 +1561,7 @@ static void ath9k_remove_interface(struc
---- a/net/mac80211/ibss.c
-+++ b/net/mac80211/ibss.c
-@@ -661,7 +661,6 @@ static void ieee80211_sta_find_ibss(stru
- static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
- struct sk_buff *req)
- {
-- struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(req);
- struct ieee80211_mgmt *mgmt = (void *)req->data;
- struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
- struct ieee80211_local *local = sdata->local;
-@@ -685,7 +684,7 @@ static void ieee80211_rx_mgmt_probe_req(
- mgmt->bssid, tx_last_beacon);
- #endif /* CONFIG_MAC80211_IBSS_DEBUG */
-
-- if (!tx_last_beacon && !(rx_status->rx_flags & IEEE80211_RX_RA_MATCH))
-+ if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
- return;
+ ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n");
- if (memcmp(mgmt->bssid, ifibss->bssid, ETH_ALEN) != 0 &&
---- a/net/mac80211/rc80211_minstrel_ht.c
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -659,18 +659,14 @@ minstrel_ht_update_caps(void *priv, stru
- struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
- struct ieee80211_local *local = hw_to_local(mp->hw);
- u16 sta_cap = sta->ht_cap.cap;
-+ int n_supported = 0;
- int ack_dur;
- int stbc;
- int i;
++ ath9k_ps_wakeup(sc);
+ mutex_lock(&sc->mutex);
- /* fall back to the old minstrel for legacy stations */
-- if (!sta->ht_cap.ht_supported) {
-- msp->is_ht = false;
-- memset(&msp->legacy, 0, sizeof(msp->legacy));
-- msp->legacy.r = msp->ratelist;
-- msp->legacy.sample_table = msp->sample_table;
-- return mac80211_minstrel.rate_init(priv, sband, sta, &msp->legacy);
-- }
-+ if (!sta->ht_cap.ht_supported)
-+ goto use_legacy;
+ sc->nvifs--;
+@@ -1569,6 +1573,7 @@ static void ath9k_remove_interface(struc
+ ath9k_calculate_summary_state(hw, NULL);
+
+ mutex_unlock(&sc->mutex);
++ ath9k_ps_restore(sc);
+ }
- BUILD_BUG_ON(ARRAY_SIZE(minstrel_mcs_groups) !=
- MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS);
-@@ -725,7 +721,22 @@ minstrel_ht_update_caps(void *priv, stru
+ static void ath9k_enable_ps(struct ath_softc *sc)
+@@ -1809,6 +1814,7 @@ static int ath9k_conf_tx(struct ieee8021
- mi->groups[i].supported =
- mcs->rx_mask[minstrel_mcs_groups[i].streams - 1];
-+
-+ if (mi->groups[i].supported)
-+ n_supported++;
+ txq = sc->tx.txq_map[queue];
+
++ ath9k_ps_wakeup(sc);
+ mutex_lock(&sc->mutex);
+
+ memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
+@@ -1832,6 +1838,7 @@ static int ath9k_conf_tx(struct ieee8021
+ ath_beaconq_config(sc);
+
+ mutex_unlock(&sc->mutex);
++ ath9k_ps_restore(sc);
+
+ return ret;
+ }
+@@ -1908,6 +1915,7 @@ static void ath9k_bss_info_changed(struc
+ int slottime;
+ int error;
+
++ ath9k_ps_wakeup(sc);
+ mutex_lock(&sc->mutex);
+
+ if (changed & BSS_CHANGED_BSSID) {
+@@ -2008,6 +2016,7 @@ static void ath9k_bss_info_changed(struc
}
+
+ mutex_unlock(&sc->mutex);
++ ath9k_ps_restore(sc);
+ }
+
+ static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -392,14 +392,6 @@ void ath_beacon_tasklet(unsigned long da
+ tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);
+ tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
+ slot = (tsftu % (intval * ATH_BCBUF)) / intval;
+- /*
+- * Reverse the slot order to get slot 0 on the TBTT offset that does
+- * not require TSF adjustment and other slots adding
+- * slot/ATH_BCBUF * beacon_int to timestamp. For example, with
+- * ATH_BCBUF = 4, we process beacon slots as follows: 3 2 1 0 3 2 1 ..
+- * and slot 0 is at correct offset to TBTT.
+- */
+- slot = ATH_BCBUF - slot - 1;
+ vif = sc->beacon.bslot[slot];
+
+ ath_dbg(common, ATH_DBG_BEACON,
+@@ -708,7 +700,7 @@ void ath_beacon_config(struct ath_softc
+ if (cur_conf->dtim_period == 0)
+ cur_conf->dtim_period = 1;
+
+- switch (iftype) {
++ switch (sc->sc_ah->opmode) {
+ case NL80211_IFTYPE_AP:
+ ath_beacon_config_ap(sc, cur_conf);
+ break;
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -1585,7 +1585,7 @@ ieee80211_drop_unencrypted_mgmt(struct i
+ }
+
+ static int
+-__ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
++__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
+ {
+ struct ieee80211_sub_if_data *sdata = rx->sdata;
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
+@@ -1593,6 +1593,7 @@ __ieee80211_data_to_8023(struct ieee8021
+ struct ethhdr *ehdr;
+ int ret;
+
++ *port_control = false;
+ if (ieee80211_has_a4(hdr->frame_control) &&
+ sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta)
+ return -1;
+@@ -1611,12 +1612,16 @@ __ieee80211_data_to_8023(struct ieee8021
+ return -1;
+
+ ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
+- if (ret < 0 || !check_port_control)
++ if (ret < 0)
+ return ret;
+
+ ehdr = (struct ethhdr *) rx->skb->data;
+- if (ehdr->h_proto != rx->sdata->control_port_protocol)
+- return -1;
++ if (ehdr->h_proto == rx->sdata->control_port_protocol) {
++ *port_control = true;
+
-+ if (!n_supported)
-+ goto use_legacy;
-+
-+ return;
++ if (check_port_control)
++ return -1;
++ }
+
+ return 0;
+ }
+@@ -1916,6 +1921,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_
+ struct net_device *dev = sdata->dev;
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
+ __le16 fc = hdr->frame_control;
++ bool port_control;
+ int err;
+
+ if (unlikely(!ieee80211_is_data(hdr->frame_control)))
+@@ -1932,13 +1938,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_
+ sdata->vif.type == NL80211_IFTYPE_AP)
+ return RX_DROP_MONITOR;
+
+- err = __ieee80211_data_to_8023(rx);
++ err = __ieee80211_data_to_8023(rx, &port_control);
+ if (unlikely(err))
+ return RX_DROP_UNUSABLE;
+
+ if (!ieee80211_frame_allowed(rx, fc))
+ return RX_DROP_MONITOR;
+
++ if (rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
++ unlikely(port_control) && sdata->bss) {
++ sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,
++ u.ap);
++ dev = sdata->dev;
++ rx->sdata = sdata;
++ }
+
-+use_legacy:
-+ msp->is_ht = false;
-+ memset(&msp->legacy, 0, sizeof(msp->legacy));
-+ msp->legacy.r = msp->ratelist;
-+ msp->legacy.sample_table = msp->sample_table;
-+ return mac80211_minstrel.rate_init(priv, sband, sta, &msp->legacy);
+ rx->skb->dev = dev;
+
+ dev->stats.rx_packets++;
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -75,7 +75,6 @@ static void ath_rx_buf_link(struct ath_s
+ *sc->rx.rxlink = bf->bf_daddr;
+
+ sc->rx.rxlink = &ds->ds_link;
+- ath9k_hw_rxena(ah);
}
- static void
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -814,8 +814,8 @@ struct ieee80211_local {
-
- struct rate_control_ref *rate_ctrl;
-
-- struct crypto_blkcipher *wep_tx_tfm;
-- struct crypto_blkcipher *wep_rx_tfm;
-+ struct crypto_cipher *wep_tx_tfm;
-+ struct crypto_cipher *wep_rx_tfm;
- u32 wep_iv;
-
- /* see iface.c */
---- a/net/mac80211/tkip.c
-+++ b/net/mac80211/tkip.c
-@@ -202,7 +202,7 @@ EXPORT_SYMBOL(ieee80211_get_tkip_key);
- * @payload_len is the length of payload (_not_ including IV/ICV length).
- * @ta is the transmitter addresses.
- */
--int ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
-+int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
- struct ieee80211_key *key,
- u8 *pos, size_t payload_len, u8 *ta)
+ static void ath_setdefantenna(struct ath_softc *sc, u32 antenna)
+@@ -426,9 +425,7 @@ u32 ath_calcrxfilter(struct ath_softc *s
+ else
+ rfilt |= ATH9K_RX_FILTER_BEACON;
+
+- if ((AR_SREV_9280_20_OR_LATER(sc->sc_ah) ||
+- AR_SREV_9285_12_OR_LATER(sc->sc_ah)) &&
+- (sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
++ if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) ||
+ (sc->rx.rxfilter & FIF_PSPOLL))
+ rfilt |= ATH9K_RX_FILTER_PSPOLL;
+
+@@ -486,12 +483,12 @@ start_recv:
+ bool ath_stoprecv(struct ath_softc *sc)
{
-@@ -223,7 +223,7 @@ int ieee80211_tkip_encrypt_data(struct c
- * beginning of the buffer containing IEEE 802.11 header payload, i.e.,
- * including IV, Ext. IV, real data, Michael MIC, ICV. @payload_len is the
- * length of payload, including IV, Ext. IV, MIC, ICV. */
--int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
-+int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
- struct ieee80211_key *key,
- u8 *payload, size_t payload_len, u8 *ta,
- u8 *ra, int only_iv, int queue,
---- a/net/mac80211/tkip.h
-+++ b/net/mac80211/tkip.h
-@@ -15,7 +15,7 @@
-
- u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16);
-
--int ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
-+int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
- struct ieee80211_key *key,
- u8 *pos, size_t payload_len, u8 *ta);
- enum {
-@@ -24,7 +24,7 @@ enum {
- TKIP_DECRYPT_INVALID_KEYIDX = -2,
- TKIP_DECRYPT_REPLAY = -3,
- };
--int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
-+int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
- struct ieee80211_key *key,
- u8 *payload, size_t payload_len, u8 *ta,
- u8 *ra, int only_iv, int queue,
---- a/net/mac80211/wep.c
-+++ b/net/mac80211/wep.c
-@@ -30,17 +30,15 @@ int ieee80211_wep_init(struct ieee80211_
- /* start WEP IV from a random value */
- get_random_bytes(&local->wep_iv, WEP_IV_LEN);
-
-- local->wep_tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
-- CRYPTO_ALG_ASYNC);
-+ local->wep_tx_tfm = crypto_alloc_cipher("arc4", 0, CRYPTO_ALG_ASYNC);
- if (IS_ERR(local->wep_tx_tfm)) {
- local->wep_rx_tfm = ERR_PTR(-EINVAL);
- return PTR_ERR(local->wep_tx_tfm);
- }
+ struct ath_hw *ah = sc->sc_ah;
+- bool stopped;
++ bool stopped, reset = false;
+
+ spin_lock_bh(&sc->rx.rxbuflock);
+ ath9k_hw_abortpcurecv(ah);
+ ath9k_hw_setrxfilter(ah, 0);
+- stopped = ath9k_hw_stopdmarecv(ah);
++ stopped = ath9k_hw_stopdmarecv(ah, &reset);
-- local->wep_rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
-- CRYPTO_ALG_ASYNC);
-+ local->wep_rx_tfm = crypto_alloc_cipher("arc4", 0, CRYPTO_ALG_ASYNC);
- if (IS_ERR(local->wep_rx_tfm)) {
-- crypto_free_blkcipher(local->wep_tx_tfm);
-+ crypto_free_cipher(local->wep_tx_tfm);
- local->wep_tx_tfm = ERR_PTR(-EINVAL);
- return PTR_ERR(local->wep_rx_tfm);
+ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
+ ath_edma_stop_recv(sc);
+@@ -506,7 +503,7 @@ bool ath_stoprecv(struct ath_softc *sc)
+ "confusing the DMA engine when we start RX up\n");
+ ATH_DBG_WARN_ON_ONCE(!stopped);
}
-@@ -51,9 +49,9 @@ int ieee80211_wep_init(struct ieee80211_
- void ieee80211_wep_free(struct ieee80211_local *local)
- {
- if (!IS_ERR(local->wep_tx_tfm))
-- crypto_free_blkcipher(local->wep_tx_tfm);
-+ crypto_free_cipher(local->wep_tx_tfm);
- if (!IS_ERR(local->wep_rx_tfm))
-- crypto_free_blkcipher(local->wep_rx_tfm);
-+ crypto_free_cipher(local->wep_rx_tfm);
+- return stopped;
++ return stopped || reset;
}
- static inline bool ieee80211_wep_weak_iv(u32 iv, int keylen)
-@@ -127,12 +125,11 @@ static void ieee80211_wep_remove_iv(stru
- /* Perform WEP encryption using given key. data buffer must have tailroom
- * for 4-byte ICV. data_len must not include this ICV. Note: this function
- * does _not_ add IV. data = RC4(data | CRC32(data)) */
--int ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
-+int ieee80211_wep_encrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- size_t klen, u8 *data, size_t data_len)
- {
-- struct blkcipher_desc desc = { .tfm = tfm };
-- struct scatterlist sg;
- __le32 icv;
-+ int i;
+ void ath_flushrecv(struct ath_softc *sc)
+@@ -1767,6 +1764,7 @@ requeue:
+ } else {
+ list_move_tail(&bf->list, &sc->rx.rxbuf);
+ ath_rx_buf_link(sc, bf);
++ ath9k_hw_rxena(ah);
+ }
+ } while (1);
- if (IS_ERR(tfm))
- return -1;
-@@ -140,9 +137,9 @@ int ieee80211_wep_encrypt_data(struct cr
- icv = cpu_to_le32(~crc32_le(~0, data, data_len));
- put_unaligned(icv, (__le32 *)(data + data_len));
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1249,15 +1249,6 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ ah->txchainmask = common->tx_chainmask;
+ ah->rxchainmask = common->rx_chainmask;
-- crypto_blkcipher_setkey(tfm, rc4key, klen);
-- sg_init_one(&sg, data, data_len + WEP_ICV_LEN);
-- crypto_blkcipher_encrypt(&desc, &sg, &sg, sg.length);
-+ crypto_cipher_setkey(tfm, rc4key, klen);
-+ for (i = 0; i < data_len + WEP_ICV_LEN; i++)
-+ crypto_cipher_encrypt_one(tfm, data + i, data + i);
+- if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) {
+- ath9k_hw_abortpcurecv(ah);
+- if (!ath9k_hw_stopdmarecv(ah)) {
+- ath_dbg(common, ATH_DBG_XMIT,
+- "Failed to stop receive dma\n");
+- bChannelChange = false;
+- }
+- }
+-
+ if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
+ return -EIO;
- return 0;
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -710,27 +710,46 @@ void ath9k_hw_abortpcurecv(struct ath_hw
}
-@@ -186,19 +183,18 @@ int ieee80211_wep_encrypt(struct ieee802
- /* Perform WEP decryption using given key. data buffer includes encrypted
- * payload, including 4-byte ICV, but _not_ IV. data_len must not include ICV.
- * Return 0 on success and -1 on ICV mismatch. */
--int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
-+int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- size_t klen, u8 *data, size_t data_len)
+ EXPORT_SYMBOL(ath9k_hw_abortpcurecv);
+
+-bool ath9k_hw_stopdmarecv(struct ath_hw *ah)
++bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
{
-- struct blkcipher_desc desc = { .tfm = tfm };
-- struct scatterlist sg;
- __le32 crc;
-+ int i;
+ #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */
+ struct ath_common *common = ath9k_hw_common(ah);
++ u32 mac_status, last_mac_status = 0;
+ int i;
- if (IS_ERR(tfm))
- return -1;
++ /* Enable access to the DMA observation bus */
++ REG_WRITE(ah, AR_MACMISC,
++ ((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) |
++ (AR_MACMISC_MISC_OBS_BUS_1 <<
++ AR_MACMISC_MISC_OBS_BUS_MSB_S)));
++
+ REG_WRITE(ah, AR_CR, AR_CR_RXD);
+
+ /* Wait for rx enable bit to go low */
+ for (i = AH_RX_STOP_DMA_TIMEOUT / AH_TIME_QUANTUM; i != 0; i--) {
+ if ((REG_READ(ah, AR_CR) & AR_CR_RXE) == 0)
+ break;
++
++ if (!AR_SREV_9300_20_OR_LATER(ah)) {
++ mac_status = REG_READ(ah, AR_DMADBG_7) & 0x7f0;
++ if (mac_status == 0x1c0 && mac_status == last_mac_status) {
++ *reset = true;
++ break;
++ }
++
++ last_mac_status = mac_status;
++ }
++
+ udelay(AH_TIME_QUANTUM);
+ }
-- crypto_blkcipher_setkey(tfm, rc4key, klen);
-- sg_init_one(&sg, data, data_len + WEP_ICV_LEN);
-- crypto_blkcipher_decrypt(&desc, &sg, &sg, sg.length);
-+ crypto_cipher_setkey(tfm, rc4key, klen);
-+ for (i = 0; i < data_len + WEP_ICV_LEN; i++)
-+ crypto_cipher_decrypt_one(tfm, data + i, data + i);
-
- crc = cpu_to_le32(~crc32_le(~0, data, data_len));
- if (memcmp(&crc, data + data_len, WEP_ICV_LEN) != 0)
---- a/net/mac80211/wep.h
-+++ b/net/mac80211/wep.h
-@@ -18,12 +18,12 @@
-
- int ieee80211_wep_init(struct ieee80211_local *local);
- void ieee80211_wep_free(struct ieee80211_local *local);
--int ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
-+int ieee80211_wep_encrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- size_t klen, u8 *data, size_t data_len);
- int ieee80211_wep_encrypt(struct ieee80211_local *local,
- struct sk_buff *skb,
- const u8 *key, int keylen, int keyidx);
--int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
-+int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- size_t klen, u8 *data, size_t data_len);
- bool ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key);
+ if (i == 0) {
+ ath_err(common,
+- "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",
++ "DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
+ AH_RX_STOP_DMA_TIMEOUT / 1000,
+ REG_READ(ah, AR_CR),
+- REG_READ(ah, AR_DIAG_SW));
++ REG_READ(ah, AR_DIAG_SW),
++ REG_READ(ah, AR_DMADBG_7));
+ return false;
+ } else {
+ return true;
+--- a/drivers/net/wireless/ath/ath9k/mac.h
++++ b/drivers/net/wireless/ath/ath9k/mac.h
+@@ -695,7 +695,7 @@ bool ath9k_hw_setrxabort(struct ath_hw *
+ void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);
+ void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning);
+ void ath9k_hw_abortpcurecv(struct ath_hw *ah);
+-bool ath9k_hw_stopdmarecv(struct ath_hw *ah);
++bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset);
+ int ath9k_hw_beaconq_setup(struct ath_hw *ah);
+ /* Interrupt Handling */
#include <asm/unaligned.h>
#include "hw.h"
-@@ -442,8 +443,16 @@ static int ath9k_hw_init_macaddr(struct
+@@ -423,8 +424,16 @@ static int ath9k_hw_init_macaddr(struct
common->macaddr[2 * i] = eeval >> 8;
common->macaddr[2 * i + 1] = eeval & 0xff;
}
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1465,8 +1465,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1437,8 +1437,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
REG_WRITE(ah, AR_OBS, 8);
if (ah->config.rx_intr_mitigation) {
--- /dev/null
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -361,7 +361,7 @@ struct ath_vif {
+ * number of beacon intervals, the game's up.
+ */
+ #define BSTUCK_THRESH 9
+-#define ATH_BCBUF 4
++#define ATH_BCBUF 8
+ #define ATH_DEFAULT_BINTVAL 100 /* TU */
+ #define ATH_DEFAULT_BMISS_LIMIT 10
+ #define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024)
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -344,8 +344,8 @@ static void ath9k_hw_init_config(struct
+ {
+ int i;
+
+- ah->config.dma_beacon_response_time = 2;
+- ah->config.sw_beacon_response_time = 10;
++ ah->config.dma_beacon_response_time = 1;
++ ah->config.sw_beacon_response_time = 6;
+ ah->config.additional_swba_backoff = 0;
+ ah->config.ack_6mb = 0x0;
+ ah->config.cwm_ignore_extcca = 0;
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -2216,6 +2216,18 @@ static inline int ieee80211_sta_ps_trans
+@@ -2227,6 +2227,18 @@ static inline int ieee80211_sta_ps_trans
#define IEEE80211_TX_STATUS_HEADROOM 13
/**
sta_info_clear_tim_bit(sta);
}
-@@ -902,6 +903,7 @@ void ieee80211_sta_ps_deliver_wakeup(str
+@@ -893,6 +894,7 @@ void ieee80211_sta_ps_deliver_wakeup(str
struct ieee80211_local *local = sdata->local;
int sent, buffered;
if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS))
drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta);
-@@ -994,3 +996,12 @@ void ieee80211_sta_block_awake(struct ie
+@@ -985,3 +987,12 @@ void ieee80211_sta_block_awake(struct ie
ieee80211_queue_work(hw, &sta->drv_unblock_wk);
}
EXPORT_SYMBOL(ieee80211_sta_block_awake);
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -202,6 +202,7 @@ struct ath_atx_ac {
+@@ -200,6 +200,7 @@ struct ath_atx_ac {
int sched;
struct list_head list;
struct list_head tid_q;
};
struct ath_frame_info {
-@@ -259,6 +260,8 @@ struct ath_node {
+@@ -257,6 +258,8 @@ struct ath_node {
struct ath_atx_ac ac[WME_NUM_AC];
u16 maxampdu;
u8 mpdudensity;
};
#define AGGR_CLEANUP BIT(1)
-@@ -340,6 +343,9 @@ int ath_tx_aggr_start(struct ath_softc *
+@@ -338,6 +341,9 @@ int ath_tx_aggr_start(struct ath_softc *
void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
/********/
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1795,6 +1795,27 @@ static int ath9k_sta_remove(struct ieee8
+@@ -1800,6 +1800,27 @@ static int ath9k_sta_remove(struct ieee8
return 0;
}
static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params)
{
-@@ -2197,6 +2218,7 @@ struct ieee80211_ops ath9k_ops = {
+@@ -2206,6 +2227,7 @@ struct ieee80211_ops ath9k_ops = {
.configure_filter = ath9k_configure_filter,
.sta_add = ath9k_sta_add,
.sta_remove = ath9k_sta_remove,
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
-@@ -128,6 +128,11 @@ static inline void ath9k_hw_set11n_virtu
- ath9k_hw_ops(ah)->set11n_virtualmorefrag(ah, ds, vmf);
+@@ -122,6 +122,11 @@ static inline void ath9k_hw_set11n_burst
+ ath9k_hw_ops(ah)->set11n_burstduration(ah, ds, burstDuration);
}
+static inline void ath9k_hw_set_clrdmask(struct ath_hw *ah, void *ds, bool val)
/* PHY ops */
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -630,6 +630,7 @@ struct ath_hw_ops {
+@@ -626,6 +626,7 @@ struct ath_hw_ops {
+ void (*clr11n_aggr)(struct ath_hw *ah, void *ds);
+ void (*set11n_burstduration)(struct ath_hw *ah, void *ds,
u32 burstDuration);
- void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds,
- u32 vmf);
+ void (*set_clrdmask)(struct ath_hw *ah, void *ds, bool val);
};
static void ar9002_hw_set11n_ratescenario(struct ath_hw *ah, void *ds,
void *lastds,
u32 durUpdateEn, u32 rtsctsRate,
-@@ -460,4 +469,5 @@ void ar9002_hw_attach_mac_ops(struct ath
+@@ -448,4 +457,5 @@ void ar9002_hw_attach_mac_ops(struct ath
+ ops->set11n_aggr_last = ar9002_hw_set11n_aggr_last;
ops->clr11n_aggr = ar9002_hw_clr11n_aggr;
ops->set11n_burstduration = ar9002_hw_set11n_burstduration;
- ops->set11n_virtualmorefrag = ar9002_hw_set11n_virtualmorefrag;
+ ops->set_clrdmask = ar9002_hw_set_clrdmask;
}
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
static void ar9003_hw_set11n_ratescenario(struct ath_hw *ah, void *ds,
void *lastds,
u32 durUpdateEn, u32 rtsctsRate,
-@@ -522,6 +531,7 @@ void ar9003_hw_attach_mac_ops(struct ath
+@@ -510,6 +519,7 @@ void ar9003_hw_attach_mac_ops(struct ath
+ ops->set11n_aggr_last = ar9003_hw_set11n_aggr_last;
ops->clr11n_aggr = ar9003_hw_clr11n_aggr;
ops->set11n_burstduration = ar9003_hw_set11n_burstduration;
- ops->set11n_virtualmorefrag = ar9003_hw_set11n_virtualmorefrag;
+ ops->set_clrdmask = ar9003_hw_set_clrdmask;
}
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -426,9 +426,7 @@ u32 ath_calcrxfilter(struct ath_softc *s
- else
- rfilt |= ATH9K_RX_FILTER_BEACON;
-
-- if ((AR_SREV_9280_20_OR_LATER(sc->sc_ah) ||
-- AR_SREV_9285_12_OR_LATER(sc->sc_ah)) &&
-- (sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
-+ if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) ||
- (sc->rx.rxfilter & FIF_PSPOLL))
- rfilt |= ATH9K_RX_FILTER_PSPOLL;
-
--- /dev/null
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -355,10 +355,12 @@ minstrel_downgrade_rate(struct minstrel_
+ }
+
+ static void
+-minstrel_aggr_check(struct minstrel_priv *mp, struct ieee80211_sta *pubsta, struct sk_buff *skb)
++minstrel_aggr_check(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
++ struct ieee80211_sta *pubsta, struct sk_buff *skb)
+ {
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+ struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
++ unsigned long t1, t2;
+ u16 tid;
+
+ if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
+@@ -374,6 +376,12 @@ minstrel_aggr_check(struct minstrel_priv
+ if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
+ return;
+
++ t1 = mi->last_aggr_start_time[tid];
++ t2 = t1 + msecs_to_jiffies(5000);
++ if (unlikely(time_in_range(jiffies, t1, t2)))
++ return;
++
++ mi->last_aggr_start_time[tid] = jiffies;
+ ieee80211_start_tx_ba_session(pubsta, tid, 5000);
+ }
+
+@@ -452,7 +460,7 @@ minstrel_ht_tx_status(void *priv, struct
+
+ if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) {
+ minstrel_ht_update_stats(mp, mi);
+- minstrel_aggr_check(mp, sta, skb);
++ minstrel_aggr_check(mp, mi, sta, skb);
+ }
+ }
+
+--- a/net/mac80211/rc80211_minstrel_ht.h
++++ b/net/mac80211/rc80211_minstrel_ht.h
+@@ -109,6 +109,8 @@ struct minstrel_ht_sta {
+
+ /* MCS rate group info and statistics */
+ struct minstrel_mcs_group_data groups[MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS];
++
++ unsigned long last_aggr_start_time[IEEE80211_QOS_CTL_TID_MASK + 1];
+ };
+
+ struct minstrel_ht_sta_priv {
+++ /dev/null
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -1584,7 +1584,7 @@ ieee80211_drop_unencrypted_mgmt(struct i
- }
-
- static int
--__ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
-+__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
- {
- struct ieee80211_sub_if_data *sdata = rx->sdata;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
-@@ -1592,6 +1592,7 @@ __ieee80211_data_to_8023(struct ieee8021
- struct ethhdr *ehdr;
- int ret;
-
-+ *port_control = false;
- if (ieee80211_has_a4(hdr->frame_control) &&
- sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta)
- return -1;
-@@ -1610,11 +1611,14 @@ __ieee80211_data_to_8023(struct ieee8021
- return -1;
-
- ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
-- if (ret < 0 || !check_port_control)
-+ if (ret < 0)
- return ret;
-
- ehdr = (struct ethhdr *) rx->skb->data;
-- if (ehdr->h_proto != rx->sdata->control_port_protocol)
-+ if (ehdr->h_proto == rx->sdata->control_port_protocol)
-+ *port_control = true;
-+
-+ if (check_port_control && !*port_control)
- return -1;
-
- return 0;
-@@ -1915,6 +1919,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_
- struct net_device *dev = sdata->dev;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
- __le16 fc = hdr->frame_control;
-+ bool port_control;
- int err;
-
- if (unlikely(!ieee80211_is_data(hdr->frame_control)))
-@@ -1931,13 +1936,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_
- sdata->vif.type == NL80211_IFTYPE_AP)
- return RX_DROP_MONITOR;
-
-- err = __ieee80211_data_to_8023(rx);
-+ err = __ieee80211_data_to_8023(rx, &port_control);
- if (unlikely(err))
- return RX_DROP_UNUSABLE;
-
- if (!ieee80211_frame_allowed(rx, fc))
- return RX_DROP_MONITOR;
-
-+ if (rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
-+ unlikely(port_control) && sdata->bss) {
-+ sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,
-+ u.ap);
-+ dev = sdata->dev;
-+ rx->sdata = sdata;
-+ }
-+
- rx->skb->dev = dev;
-
- dev->stats.rx_packets++;
--- /dev/null
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -956,6 +956,9 @@ static int ath9k_rx_skb_preprocess(struc
+ struct ieee80211_rx_status *rx_status,
+ bool *decrypt_error)
+ {
++ struct ath_hw *ah = common->ah;
++ int noise;
++
+ memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
+
+ /*
+@@ -976,7 +979,13 @@ static int ath9k_rx_skb_preprocess(struc
+
+ rx_status->band = hw->conf.channel->band;
+ rx_status->freq = hw->conf.channel->center_freq;
+- rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
++
++ if (ah->curchan && ah->curchan->noisefloor)
++ noise = ah->curchan->noisefloor;
++ else
++ noise = ATH_DEFAULT_NOISE_FLOOR;
++
++ rx_status->signal = noise + rx_stats->rs_rssi;
+ rx_status->antenna = rx_stats->rs_antenna;
+ rx_status->flag |= RX_FLAG_MACTIME_MPDU;
+
+++ /dev/null
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -613,7 +613,7 @@ static void ieee80211_sta_reorder_releas
- continue;
- }
- if (!time_after(jiffies, tid_agg_rx->reorder_time[j] +
-- HT_RX_REORDER_BUF_TIMEOUT))
-+ HT_RX_REORDER_BUF_TIMEOUT) && skipped)
- goto set_release_timer;
-
- #ifdef CONFIG_MAC80211_HT_DEBUG
+++ /dev/null
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -2555,7 +2555,6 @@ static void ieee80211_rx_handlers(struct
- * same TID from the same station
- */
- rx->skb = skb;
-- rx->flags = 0;
-
- CALL_RXH(ieee80211_rx_h_decrypt)
- CALL_RXH(ieee80211_rx_h_check_more_data)
-@@ -2626,6 +2625,7 @@ void ieee80211_release_reorder_timeout(s
- .sdata = sta->sdata,
- .local = sta->local,
- .queue = tid,
-+ .flags = 0,
- };
- struct tid_ampdu_rx *tid_agg_rx;
-
+++ /dev/null
---- a/net/mac80211/rc80211_minstrel_ht.c
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -355,10 +355,12 @@ minstrel_downgrade_rate(struct minstrel_
- }
-
- static void
--minstrel_aggr_check(struct minstrel_priv *mp, struct ieee80211_sta *pubsta, struct sk_buff *skb)
-+minstrel_aggr_check(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,
-+ struct ieee80211_sta *pubsta, struct sk_buff *skb)
- {
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
- struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
-+ unsigned long t1, t2;
- u16 tid;
-
- if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
-@@ -374,6 +376,12 @@ minstrel_aggr_check(struct minstrel_priv
- if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
- return;
-
-+ t1 = mi->last_aggr_start_time[tid];
-+ t2 = t1 + msecs_to_jiffies(5000);
-+ if (unlikely(time_in_range(jiffies, t1, t2)))
-+ return;
-+
-+ mi->last_aggr_start_time[tid] = jiffies;
- ieee80211_start_tx_ba_session(pubsta, tid, 5000);
- }
-
-@@ -452,7 +460,7 @@ minstrel_ht_tx_status(void *priv, struct
-
- if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) {
- minstrel_ht_update_stats(mp, mi);
-- minstrel_aggr_check(mp, sta, skb);
-+ minstrel_aggr_check(mp, mi, sta, skb);
- }
- }
-
---- a/net/mac80211/rc80211_minstrel_ht.h
-+++ b/net/mac80211/rc80211_minstrel_ht.h
-@@ -109,6 +109,8 @@ struct minstrel_ht_sta {
-
- /* MCS rate group info and statistics */
- struct minstrel_mcs_group_data groups[MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS];
-+
-+ unsigned long last_aggr_start_time[IEEE80211_QOS_CTL_TID_MASK + 1];
- };
-
- struct minstrel_ht_sta_priv {
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -369,7 +369,7 @@ struct ath_vif {
- * number of beacon intervals, the game's up.
- */
- #define BSTUCK_THRESH 9
--#define ATH_BCBUF 4
-+#define ATH_BCBUF 8
- #define ATH_DEFAULT_BINTVAL 100 /* TU */
- #define ATH_DEFAULT_BMISS_LIMIT 10
- #define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024)
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -363,8 +363,8 @@ static void ath9k_hw_init_config(struct
- {
- int i;
-
-- ah->config.dma_beacon_response_time = 2;
-- ah->config.sw_beacon_response_time = 10;
-+ ah->config.dma_beacon_response_time = 1;
-+ ah->config.sw_beacon_response_time = 6;
- ah->config.additional_swba_backoff = 0;
- ah->config.ack_6mb = 0x0;
- ah->config.cwm_ignore_extcca = 0;
--- /dev/null
+--- a/net/mac80211/sta_info.h
++++ b/net/mac80211/sta_info.h
+@@ -31,7 +31,6 @@
+ * frames.
+ * @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
+ * @WLAN_STA_WME: Station is a QoS-STA.
+- * @WLAN_STA_WDS: Station is one of our WDS peers.
+ * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
+ * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
+ * frame to this station is transmitted.
+@@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
+ WLAN_STA_SHORT_PREAMBLE = 1<<4,
+ WLAN_STA_ASSOC_AP = 1<<5,
+ WLAN_STA_WME = 1<<6,
+- WLAN_STA_WDS = 1<<7,
+ WLAN_STA_CLEAR_PS_FILT = 1<<9,
+ WLAN_STA_MFP = 1<<10,
+ WLAN_STA_BLOCK_BA = 1<<11,
+--- a/net/mac80211/debugfs_sta.c
++++ b/net/mac80211/debugfs_sta.c
+@@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
+ staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
+ staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
+ staflags & WLAN_STA_WME ? "WME\n" : "",
+- staflags & WLAN_STA_WDS ? "WDS\n" : "",
+ staflags & WLAN_STA_MFP ? "MFP\n" : "");
+ return simple_read_from_buffer(userbuf, count, ppos, buf, res);
+ }
--- /dev/null
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -2330,13 +2330,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+
+ if (!ieee80211_vif_is_mesh(&sdata->vif) &&
+ sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+- sdata->vif.type != NL80211_IFTYPE_STATION)
++ sdata->vif.type != NL80211_IFTYPE_STATION &&
++ sdata->vif.type != NL80211_IFTYPE_WDS)
+ return RX_DROP_MONITOR;
+
+ switch (stype) {
+ case cpu_to_le16(IEEE80211_STYPE_BEACON):
+ case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
+- /* process for all: mesh, mlme, ibss */
++ /* process for all: mesh, mlme, ibss, wds */
+ break;
+ case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
+ case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
+@@ -2716,7 +2717,10 @@ static int prepare_for_handlers(struct i
+ }
+ break;
+ case NL80211_IFTYPE_WDS:
+- if (bssid || !ieee80211_is_data(hdr->frame_control))
++ if (bssid) {
++ if (!ieee80211_is_beacon(hdr->frame_control))
++ return 0;
++ } else if (!ieee80211_is_data(hdr->frame_control))
+ return 0;
+ if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))
+ return 0;
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
+ {
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ struct ieee80211_local *local = sdata->local;
+- struct sta_info *sta;
+ u32 changed = 0;
+ int res;
+ u32 hw_reconf_flags = 0;
+@@ -290,27 +289,6 @@ static int ieee80211_do_open(struct net_
+
+ set_bit(SDATA_STATE_RUNNING, &sdata->state);
+
+- if (sdata->vif.type == NL80211_IFTYPE_WDS) {
+- /* Create STA entry for the WDS peer */
+- sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
+- GFP_KERNEL);
+- if (!sta) {
+- res = -ENOMEM;
+- goto err_del_interface;
+- }
+-
+- /* no locking required since STA is not live yet */
+- sta->flags |= WLAN_STA_AUTHORIZED;
+-
+- res = sta_info_insert(sta);
+- if (res) {
+- /* STA has been freed */
+- goto err_del_interface;
+- }
+-
+- rate_control_rate_init(sta);
+- }
+-
+ /*
+ * set_multicast_list will be invoked by the networking core
+ * which will check whether any increments here were done in
+@@ -344,8 +322,7 @@ static int ieee80211_do_open(struct net_
+ netif_tx_start_all_queues(dev);
+
+ return 0;
+- err_del_interface:
+- drv_remove_interface(local, &sdata->vif);
++
+ err_stop:
+ if (!local->open_count)
+ drv_stop(local);
+@@ -717,6 +694,70 @@ static void ieee80211_if_setup(struct ne
+ dev->destructor = free_netdev;
+ }
+
++static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
++ struct sk_buff *skb)
++{
++ struct ieee80211_local *local = sdata->local;
++ struct ieee80211_rx_status *rx_status;
++ struct ieee802_11_elems elems;
++ struct ieee80211_mgmt *mgmt;
++ struct sta_info *sta;
++ size_t baselen;
++ u32 rates = 0;
++ u16 stype;
++ bool new = false;
++ enum ieee80211_band band = local->hw.conf.channel->band;
++ struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
++
++ rx_status = IEEE80211_SKB_RXCB(skb);
++ mgmt = (struct ieee80211_mgmt *) skb->data;
++ stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
++
++ if (stype != IEEE80211_STYPE_BEACON)
++ return;
++
++ baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
++ if (baselen > skb->len)
++ return;
++
++ ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
++ skb->len - baselen, &elems);
++
++ rates = ieee80211_sta_get_rates(local, &elems, band);
++
++ rcu_read_lock();
++
++ sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
++
++ if (!sta) {
++ rcu_read_unlock();
++ sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
++ GFP_KERNEL);
++ if (!sta)
++ return;
++
++ new = true;
++ }
++
++ sta->last_rx = jiffies;
++ sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
++
++ if (elems.ht_cap_elem)
++ ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
++ elems.ht_cap_elem, &sta->sta.ht_cap);
++
++ if (elems.wmm_param)
++ set_sta_flags(sta, WLAN_STA_WME);
++
++ if (new) {
++ sta->flags = WLAN_STA_AUTHORIZED;
++ rate_control_rate_init(sta);
++ sta_info_insert_rcu(sta);
++ }
++
++ rcu_read_unlock();
++}
++
+ static void ieee80211_iface_work(struct work_struct *work)
+ {
+ struct ieee80211_sub_if_data *sdata =
+@@ -821,6 +862,9 @@ static void ieee80211_iface_work(struct
+ break;
+ ieee80211_mesh_rx_queued_mgmt(sdata, skb);
+ break;
++ case NL80211_IFTYPE_WDS:
++ ieee80211_wds_rx_queued_mgmt(sdata, skb);
++ break;
+ default:
+ WARN(1, "frame for unexpected interface type");
+ break;
--- /dev/null
+--- a/net/mac80211/agg-tx.c
++++ b/net/mac80211/agg-tx.c
+@@ -79,7 +79,8 @@ static void ieee80211_send_addba_request
+ memcpy(mgmt->da, da, ETH_ALEN);
+ memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
+ if (sdata->vif.type == NL80211_IFTYPE_AP ||
+- sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
++ sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
++ sdata->vif.type == NL80211_IFTYPE_WDS)
+ memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
+ else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+ memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
+@@ -377,7 +378,8 @@ int ieee80211_start_tx_ba_session(struct
+ */
+ if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+ sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
+- sdata->vif.type != NL80211_IFTYPE_AP)
++ sdata->vif.type != NL80211_IFTYPE_AP &&
++ sdata->vif.type != NL80211_IFTYPE_WDS)
+ return -EINVAL;
+
+ if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
+--- a/net/mac80211/agg-rx.c
++++ b/net/mac80211/agg-rx.c
+@@ -160,6 +160,8 @@ static void ieee80211_send_addba_resp(st
+ memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
+ else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+ memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
++ else if (sdata->vif.type == NL80211_IFTYPE_WDS)
++ memcpy(mgmt->bssid, da, ETH_ALEN);
+
+ mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+ IEEE80211_STYPE_ACTION);
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -2132,7 +2132,8 @@ ieee80211_rx_h_action(struct ieee80211_r
+ */
+ if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+ sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
+- sdata->vif.type != NL80211_IFTYPE_AP)
++ sdata->vif.type != NL80211_IFTYPE_AP &&
++ sdata->vif.type != NL80211_IFTYPE_WDS)
+ break;
+
+ /* verify action_code is present */
+@@ -2717,13 +2718,16 @@ static int prepare_for_handlers(struct i
+ }
+ break;
+ case NL80211_IFTYPE_WDS:
+- if (bssid) {
+- if (!ieee80211_is_beacon(hdr->frame_control))
+- return 0;
+- } else if (!ieee80211_is_data(hdr->frame_control))
+- return 0;
+ if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2))
+ return 0;
++
++ if (ieee80211_is_data(hdr->frame_control) ||
++ ieee80211_is_action(hdr->frame_control)) {
++ if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
++ return 0;
++ } else if (!ieee80211_is_beacon(hdr->frame_control))
++ return 0;
++
+ break;
+ default:
+ /* should never get here */
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -957,6 +957,9 @@ static int ath9k_rx_skb_preprocess(struc
- struct ieee80211_rx_status *rx_status,
- bool *decrypt_error)
- {
-+ struct ath_hw *ah = common->ah;
-+ int noise;
-+
- memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
-
- /*
-@@ -977,7 +980,13 @@ static int ath9k_rx_skb_preprocess(struc
-
- rx_status->band = hw->conf.channel->band;
- rx_status->freq = hw->conf.channel->center_freq;
-- rx_status->signal = ATH_DEFAULT_NOISE_FLOOR + rx_stats->rs_rssi;
-+
-+ if (ah->curchan && ah->curchan->noisefloor)
-+ noise = ah->curchan->noisefloor;
-+ else
-+ noise = ATH_DEFAULT_NOISE_FLOOR;
-+
-+ rx_status->signal = noise + rx_stats->rs_rssi;
- rx_status->antenna = rx_stats->rs_antenna;
- rx_status->flag |= RX_FLAG_MACTIME_MPDU;
-
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -392,14 +392,6 @@ void ath_beacon_tasklet(unsigned long da
- tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);
- tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
- slot = (tsftu % (intval * ATH_BCBUF)) / intval;
-- /*
-- * Reverse the slot order to get slot 0 on the TBTT offset that does
-- * not require TSF adjustment and other slots adding
-- * slot/ATH_BCBUF * beacon_int to timestamp. For example, with
-- * ATH_BCBUF = 4, we process beacon slots as follows: 3 2 1 0 3 2 1 ..
-- * and slot 0 is at correct offset to TBTT.
-- */
-- slot = ATH_BCBUF - slot - 1;
- vif = sc->beacon.bslot[slot];
-
- ath_dbg(common, ATH_DBG_BEACON,
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -700,7 +700,7 @@ void ath_beacon_config(struct ath_softc
- if (cur_conf->dtim_period == 0)
- cur_conf->dtim_period = 1;
-
-- switch (iftype) {
-+ switch (sc->sc_ah->opmode) {
- case NL80211_IFTYPE_AP:
- ath_beacon_config_ap(sc, cur_conf);
- break;
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -324,7 +324,6 @@ static void ath_paprd_activate(struct at
- if (!caldata || !caldata->paprd_done)
- return;
-
-- ath9k_ps_wakeup(sc);
- ar9003_paprd_enable(ah, false);
- for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
- if (!(common->tx_chainmask & BIT(chain)))
-@@ -334,7 +333,6 @@ static void ath_paprd_activate(struct at
- }
-
- ar9003_paprd_enable(ah, true);
-- ath9k_ps_restore(sc);
- }
-
- static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
-@@ -554,8 +552,11 @@ set_timer:
- if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) {
- if (!ah->caldata->paprd_done)
- ieee80211_queue_work(sc->hw, &sc->paprd_work);
-- else if (!ah->paprd_table_write_done)
-+ else if (!ah->paprd_table_write_done) {
-+ ath9k_ps_wakeup(sc);
- ath_paprd_activate(sc);
-+ ath9k_ps_restore(sc);
-+ }
- }
- }
-
-@@ -1376,7 +1377,6 @@ static void ath9k_calculate_summary_stat
-
- ath9k_calculate_iter_data(hw, vif, &iter_data);
-
-- ath9k_ps_wakeup(sc);
- /* Set BSSID mask. */
- memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
- ath_hw_setbssidmask(common);
-@@ -1411,7 +1411,6 @@ static void ath9k_calculate_summary_stat
- }
-
- ath9k_hw_set_interrupts(ah, ah->imask);
-- ath9k_ps_restore(sc);
-
- /* Set up ANI */
- if ((iter_data.naps + iter_data.nadhocs) > 0) {
-@@ -1457,6 +1456,7 @@ static int ath9k_add_interface(struct ie
- struct ath_vif *avp = (void *)vif->drv_priv;
- int ret = 0;
-
-+ ath9k_ps_wakeup(sc);
- mutex_lock(&sc->mutex);
-
- switch (vif->type) {
-@@ -1503,6 +1503,7 @@ static int ath9k_add_interface(struct ie
- ath9k_do_vif_add_setup(hw, vif);
- out:
- mutex_unlock(&sc->mutex);
-+ ath9k_ps_restore(sc);
- return ret;
- }
-
-@@ -1517,6 +1518,7 @@ static int ath9k_change_interface(struct
-
- ath_dbg(common, ATH_DBG_CONFIG, "Change Interface\n");
- mutex_lock(&sc->mutex);
-+ ath9k_ps_wakeup(sc);
-
- /* See if new interface type is valid. */
- if ((new_type == NL80211_IFTYPE_ADHOC) &&
-@@ -1546,6 +1548,7 @@ static int ath9k_change_interface(struct
-
- ath9k_do_vif_add_setup(hw, vif);
- out:
-+ ath9k_ps_restore(sc);
- mutex_unlock(&sc->mutex);
- return ret;
- }
-@@ -1558,6 +1561,7 @@ static void ath9k_remove_interface(struc
-
- ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n");
-
-+ ath9k_ps_wakeup(sc);
- mutex_lock(&sc->mutex);
-
- sc->nvifs--;
-@@ -1569,6 +1573,7 @@ static void ath9k_remove_interface(struc
- ath9k_calculate_summary_state(hw, NULL);
-
- mutex_unlock(&sc->mutex);
-+ ath9k_ps_restore(sc);
- }
-
- static void ath9k_enable_ps(struct ath_softc *sc)
-@@ -1830,6 +1835,7 @@ static int ath9k_conf_tx(struct ieee8021
-
- txq = sc->tx.txq_map[queue];
-
-+ ath9k_ps_wakeup(sc);
- mutex_lock(&sc->mutex);
-
- memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
-@@ -1853,6 +1859,7 @@ static int ath9k_conf_tx(struct ieee8021
- ath_beaconq_config(sc);
-
- mutex_unlock(&sc->mutex);
-+ ath9k_ps_restore(sc);
-
- return ret;
- }
-@@ -1929,6 +1936,7 @@ static void ath9k_bss_info_changed(struc
- int slottime;
- int error;
-
-+ ath9k_ps_wakeup(sc);
- mutex_lock(&sc->mutex);
-
- if (changed & BSS_CHANGED_BSSID) {
-@@ -2029,6 +2037,7 @@ static void ath9k_bss_info_changed(struc
- }
-
- mutex_unlock(&sc->mutex);
-+ ath9k_ps_restore(sc);
- }
-
- static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -196,6 +196,7 @@ void rt2x00pci_uninitialize(struct rt2x0
+@@ -199,6 +199,7 @@ void rt2x00pci_uninitialize(struct rt2x0
}
EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
/*
* PCI driver handlers.
*/
-@@ -372,6 +373,7 @@ int rt2x00pci_resume(struct pci_dev *pci
+@@ -375,6 +376,7 @@ int rt2x00pci_resume(struct pci_dev *pci
}
EXPORT_SYMBOL_GPL(rt2x00pci_resume);
#endif /* CONFIG_PM */
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -261,8 +261,10 @@ int rt2x00pci_probe(struct pci_dev *pci_
+@@ -264,8 +264,10 @@ int rt2x00pci_probe(struct pci_dev *pci_
pci_set_master(pci_dev);
--- /dev/null
+--- a/drivers/net/wireless/rt2x00/rt2800lib.c
++++ b/drivers/net/wireless/rt2x00/rt2800lib.c
+@@ -938,6 +938,7 @@ EXPORT_SYMBOL_GPL(rt2800_rfkill_poll);
+ static void rt2800_brightness_set(struct led_classdev *led_cdev,
+ enum led_brightness brightness)
+ {
++ u32 reg;
+ struct rt2x00_led *led =
+ container_of(led_cdev, struct rt2x00_led, led_dev);
+ unsigned int enabled = brightness != LED_OFF;
+@@ -950,24 +951,46 @@ static void rt2800_brightness_set(struct
+ rt2x00_get_field16(led->rt2x00dev->led_mcu_reg,
+ EEPROM_FREQ_LED_MODE);
+
+- if (led->type == LED_TYPE_RADIO) {
+- rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
+- enabled ? 0x20 : 0);
+- } else if (led->type == LED_TYPE_ASSOC) {
+- rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
+- enabled ? (bg_mode ? 0x60 : 0xa0) : 0x20);
+- } else if (led->type == LED_TYPE_QUALITY) {
+- /*
+- * The brightness is divided into 6 levels (0 - 5),
+- * The specs tell us the following levels:
+- * 0, 1 ,3, 7, 15, 31
+- * to determine the level in a simple way we can simply
+- * work with bitshifting:
+- * (1 << level) - 1
+- */
+- rt2800_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff,
+- (1 << brightness / (LED_FULL / 6)) - 1,
+- polarity);
++ /* Check for SoC (SOC devices don't support MCU requests) */
++ if (rt2x00_is_soc(led->rt2x00dev)) {
++ rt2800_register_read(led->rt2x00dev, LED_CFG, ®);
++
++ /* Set LED Polarity */
++ rt2x00_set_field32(®, LED_CFG_LED_POLAR, polarity);
++
++ /* Set LED Mode */
++ if (led->type == LED_TYPE_RADIO) {
++ rt2x00_set_field32(®, LED_CFG_G_LED_MODE,
++ enabled ? 3 : 0);
++ } else if (led->type == LED_TYPE_ASSOC) {
++ rt2x00_set_field32(®, LED_CFG_Y_LED_MODE,
++ enabled ? 3 : 0);
++ } else if (led->type == LED_TYPE_QUALITY) {
++ rt2x00_set_field32(®, LED_CFG_R_LED_MODE,
++ enabled ? 3 : 0);
++ }
++ rt2800_register_write(led->rt2x00dev, LED_CFG, reg);
++ }
++ else {
++ if (led->type == LED_TYPE_RADIO) {
++ rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
++ enabled ? 0x20 : 0);
++ } else if (led->type == LED_TYPE_ASSOC) {
++ rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
++ enabled ? (bg_mode ? 0x60 : 0xa0) : 0x20);
++ } else if (led->type == LED_TYPE_QUALITY) {
++ /*
++ * The brightness is divided into 6 levels (0 - 5),
++ * The specs tell us the following levels:
++ * 0, 1 ,3, 7, 15, 31
++ * to determine the level in a simple way we can simply
++ * work with bitshifting:
++ * (1 << level) - 1
++ */
++ rt2800_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff,
++ (1 << brightness / (LED_FULL / 6)) - 1,
++ polarity);
++ }
+ }
+ }
+
projects / 10.03 / openwrt.git / commitdiff