diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-19 18:32:39 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-19 18:32:39 +0000 |
| commit | 5568f3e890198f691fc1ee0456a45d9b9e1a2490 (patch) | |
| tree | 7a85fe56c368913a5f2b494c9082c6f72aa56113 /package/mac80211/patches | |
| parent | e529cdf748e037fd511444fe1c116a33b0ac4581 (diff) | |
mac80211: update to 2012-04-17, adds some build fixes and juhosg's ar9380 tx power fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31347 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches')
19 files changed, 239 insertions, 541 deletions
diff --git a/package/mac80211/patches/005-disable_ssb_build.patch b/package/mac80211/patches/005-disable_ssb_build.patch index 0770caadcf..442ed25481 100644 --- a/package/mac80211/patches/005-disable_ssb_build.patch +++ b/package/mac80211/patches/005-disable_ssb_build.patch @@ -30,7 +30,7 @@ export CONFIG_SSB_SPROM=y @@ -351,7 +352,7 @@ endif #CONFIG_PCMCIA - # CONFIG_SSB_DEBUG=y + # export CONFIG_SSB_DEBUG=y export CONFIG_SSB_DRIVER_PCICORE=y export CONFIG_B43_SSB=y -endif #CONFIG_SSB diff --git a/package/mac80211/patches/006-disable_bcma_build.patch b/package/mac80211/patches/006-disable_bcma_build.patch index 33d164ba66..e5395e0260 100644 --- a/package/mac80211/patches/006-disable_bcma_build.patch +++ b/package/mac80211/patches/006-disable_bcma_build.patch @@ -20,7 +20,7 @@ +# export CONFIG_BCMA=m +# export CONFIG_BCMA_BLOCKIO=y +# export CONFIG_BCMA_HOST_PCI=y - # CONFIG_BCMA_DEBUG=y + # export CONFIG_BCMA_DEBUG=y -export CONFIG_B43_BCMA=y -export CONFIG_B43_BCMA_EXTRA=y +# export CONFIG_B43_BCMA=y diff --git a/package/mac80211/patches/013-disable_b43_nphy.patch b/package/mac80211/patches/013-disable_b43_nphy.patch index 5bd6e1ef0c..72a5778e1d 100644 --- a/package/mac80211/patches/013-disable_b43_nphy.patch +++ b/package/mac80211/patches/013-disable_b43_nphy.patch @@ -8,6 +8,6 @@ -export CONFIG_B43_PHY_HT=y +# export CONFIG_B43_PHY_N=y +# export CONFIG_B43_PHY_HT=y - # CONFIG_B43_PHY_LCN=y - # CONFIG_B43_DEBUG=y + # export CONFIG_B43_PHY_LCN=y + # export CONFIG_B43_DEBUG=y diff --git a/package/mac80211/patches/110-disable_usb_compat.patch b/package/mac80211/patches/110-disable_usb_compat.patch index 04e9101b78..eee924cf01 100644 --- a/package/mac80211/patches/110-disable_usb_compat.patch +++ b/package/mac80211/patches/110-disable_usb_compat.patch @@ -41,4 +41,4 @@ +# export CONFIG_COMPAT_USB_URB_THREAD_FIX=y export CONFIG_ATH9K_HTC=m - # CONFIG_ATH9K_HTC_DEBUGFS=y + # export CONFIG_ATH9K_HTC_DEBUGFS=y diff --git a/package/mac80211/patches/120-pr_fmt_warnings.patch b/package/mac80211/patches/120-pr_fmt_warnings.patch index a8f7868b21..ffde0f8a01 100644 --- a/package/mac80211/patches/120-pr_fmt_warnings.patch +++ b/package/mac80211/patches/120-pr_fmt_warnings.patch @@ -1,230 +1,3 @@ ---- a/drivers/net/wireless/iwlegacy/3945-mac.c -+++ b/drivers/net/wireless/iwlegacy/3945-mac.c -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/kernel.h> ---- a/drivers/net/wireless/libertas_tf/cmd.c -+++ b/drivers/net/wireless/libertas_tf/cmd.c -@@ -7,6 +7,7 @@ - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - */ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/hardirq.h> ---- a/drivers/net/wireless/libertas_tf/if_usb.c -+++ b/drivers/net/wireless/libertas_tf/if_usb.c -@@ -9,6 +9,7 @@ - */ - #define DRV_NAME "lbtf_usb" - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "libertas_tf.h" ---- a/drivers/net/wireless/libertas_tf/main.c -+++ b/drivers/net/wireless/libertas_tf/main.c -@@ -7,6 +7,7 @@ - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - */ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/hardirq.h> ---- a/net/wireless/core.c -+++ b/net/wireless/core.c -@@ -4,6 +4,7 @@ - * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/if.h> ---- a/net/wireless/lib80211.c -+++ b/net/wireless/lib80211.c -@@ -13,6 +13,7 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/module.h> ---- a/net/wireless/lib80211_crypt_tkip.c -+++ b/net/wireless/lib80211_crypt_tkip.c -@@ -10,6 +10,7 @@ - * more details. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/err.h> ---- a/net/wireless/reg.c -+++ b/net/wireless/reg.c -@@ -42,6 +42,7 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/kernel.h> ---- a/drivers/net/wireless/iwlegacy/4965-mac.c -+++ b/drivers/net/wireless/iwlegacy/4965-mac.c -@@ -27,6 +27,7 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/kernel.h> ---- a/drivers/net/wireless/libertas/cfg.c -+++ b/drivers/net/wireless/libertas/cfg.c -@@ -6,6 +6,7 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/hardirq.h> ---- a/drivers/net/wireless/libertas/if_cs.c -+++ b/drivers/net/wireless/libertas/if_cs.c -@@ -21,6 +21,7 @@ - - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/module.h> ---- a/drivers/net/wireless/libertas/if_sdio.c -+++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -26,6 +26,7 @@ - * if_sdio_card_to_host() to pad the data. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/kernel.h> ---- a/drivers/net/wireless/libertas/if_spi.c -+++ b/drivers/net/wireless/libertas/if_spi.c -@@ -17,6 +17,7 @@ - * (at your option) any later version. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/hardirq.h> ---- a/drivers/net/wireless/libertas/if_usb.c -+++ b/drivers/net/wireless/libertas/if_usb.c -@@ -2,6 +2,7 @@ - * This file contains functions used in USB interface module. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/delay.h> ---- a/drivers/net/wireless/libertas/main.c -+++ b/drivers/net/wireless/libertas/main.c -@@ -4,6 +4,7 @@ - * thread etc.. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/module.h> ---- a/drivers/net/wireless/libertas/mesh.c -+++ b/drivers/net/wireless/libertas/mesh.c -@@ -1,3 +1,4 @@ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/delay.h> ---- a/drivers/net/wireless/libertas/rx.c -+++ b/drivers/net/wireless/libertas/rx.c -@@ -2,6 +2,7 @@ - * This file contains the handling of RX in wlan driver. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/etherdevice.h> ---- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c -@@ -16,6 +16,7 @@ - * File contents: support functions for PCI/PCIe - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/delay.h> ---- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c -@@ -14,6 +14,7 @@ - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/slab.h> ---- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c -@@ -15,6 +15,7 @@ - */ - - #define __UNDEF_NO_VERSION__ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/etherdevice.h> ---- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c -@@ -14,6 +14,7 @@ - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/kernel.h> ---- a/drivers/net/wireless/brcm80211/brcmutil/utils.c -+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c -@@ -14,6 +14,7 @@ - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/netdevice.h> ---- a/drivers/net/wireless/brcm80211/brcmsmac/main.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c -@@ -14,6 +14,7 @@ - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/pci_ids.h> --- a/drivers/net/wireless/ath/ath5k/ani.c +++ b/drivers/net/wireless/ath/ath5k/ani.c @@ -14,6 +14,7 @@ diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 23b992d350..9fc2e2c0ef 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -1,23 +1,5 @@ --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -1171,7 +1171,7 @@ ath5k_check_ibss_tsf(struct ath5k_hw *ah - - if (ieee80211_is_beacon(mgmt->frame_control) && - le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS && -- memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) == 0) { -+ compare_ether_addr(mgmt->bssid, common->curbssid) == 0) { - /* - * Received an IBSS beacon with the same BSSID. Hardware *must* - * have updated the local TSF. We have to work around various -@@ -1235,7 +1235,7 @@ ath5k_update_beacon_rssi(struct ath5k_hw - - /* only beacons from our BSSID */ - if (!ieee80211_is_beacon(mgmt->frame_control) || -- memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) != 0) -+ compare_ether_addr(mgmt->bssid, common->curbssid) != 0) - return; - - ewma_add(&ah->ah_beacon_rssi_avg, rssi); @@ -2416,6 +2416,22 @@ ath5k_tx_complete_poll_work(struct work_ * Initialization routines * \*************************/ @@ -51,30 +33,6 @@ /* SW support for IBSS_RSN is provided by mac80211 */ hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; ---- a/drivers/net/wireless/ath/ath9k/ani.c -+++ b/drivers/net/wireless/ath/ath9k/ani.c -@@ -274,7 +274,9 @@ static void ath9k_hw_set_ofdm_nil(struct - aniState->rssiThrLow, aniState->rssiThrHigh); - - if (aniState->update_ani) -- aniState->ofdmNoiseImmunityLevel = immunityLevel; -+ aniState->ofdmNoiseImmunityLevel = -+ (immunityLevel > ATH9K_ANI_OFDM_DEF_LEVEL) ? -+ immunityLevel : ATH9K_ANI_OFDM_DEF_LEVEL; - - entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel]; - entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel]; -@@ -340,7 +342,9 @@ static void ath9k_hw_set_cck_nil(struct - immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI; - - if (aniState->update_ani) -- aniState->cckNoiseImmunityLevel = immunityLevel; -+ aniState->cckNoiseImmunityLevel = -+ (immunityLevel > ATH9K_ANI_CCK_DEF_LEVEL) ? -+ immunityLevel : ATH9K_ANI_CCK_DEF_LEVEL; - - entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel]; - entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel]; --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c @@ -618,19 +618,10 @@ static void ar5008_hw_init_bb(struct ath @@ -140,6 +98,122 @@ skip_tx_iqcal: if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) { +--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +@@ -4281,18 +4281,10 @@ static int ar9003_hw_tx_power_regwrite(s + #undef POW_SM + } + +-static void ar9003_hw_set_target_power_eeprom(struct ath_hw *ah, u16 freq, +- u8 *targetPowerValT2) ++static void ar9003_hw_get_legacy_target_powers(struct ath_hw *ah, u16 freq, ++ u8 *targetPowerValT2, ++ bool is2GHz) + { +- /* XXX: hard code for now, need to get from eeprom struct */ +- u8 ht40PowerIncForPdadc = 0; +- bool is2GHz = false; +- unsigned int i = 0; +- struct ath_common *common = ath9k_hw_common(ah); +- +- if (freq < 4000) +- is2GHz = true; +- + targetPowerValT2[ALL_TARGET_LEGACY_6_24] = + ar9003_hw_eeprom_get_tgt_pwr(ah, LEGACY_TARGET_RATE_6_24, freq, + is2GHz); +@@ -4305,6 +4297,11 @@ static void ar9003_hw_set_target_power_e + targetPowerValT2[ALL_TARGET_LEGACY_54] = + ar9003_hw_eeprom_get_tgt_pwr(ah, LEGACY_TARGET_RATE_54, freq, + is2GHz); ++} ++ ++static void ar9003_hw_get_cck_target_powers(struct ath_hw *ah, u16 freq, ++ u8 *targetPowerValT2) ++{ + targetPowerValT2[ALL_TARGET_LEGACY_1L_5L] = + ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_1L_5L, + freq); +@@ -4314,6 +4311,11 @@ static void ar9003_hw_set_target_power_e + ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_11L, freq); + targetPowerValT2[ALL_TARGET_LEGACY_11S] = + ar9003_hw_eeprom_get_cck_tgt_pwr(ah, LEGACY_TARGET_RATE_11S, freq); ++} ++ ++static void ar9003_hw_get_ht20_target_powers(struct ath_hw *ah, u16 freq, ++ u8 *targetPowerValT2, bool is2GHz) ++{ + targetPowerValT2[ALL_TARGET_HT20_0_8_16] = + ar9003_hw_eeprom_get_ht20_tgt_pwr(ah, HT_TARGET_RATE_0_8_16, freq, + is2GHz); +@@ -4356,6 +4358,16 @@ static void ar9003_hw_set_target_power_e + targetPowerValT2[ALL_TARGET_HT20_23] = + ar9003_hw_eeprom_get_ht20_tgt_pwr(ah, HT_TARGET_RATE_23, freq, + is2GHz); ++} ++ ++static void ar9003_hw_get_ht40_target_powers(struct ath_hw *ah, ++ u16 freq, ++ u8 *targetPowerValT2, ++ bool is2GHz) ++{ ++ /* XXX: hard code for now, need to get from eeprom struct */ ++ u8 ht40PowerIncForPdadc = 0; ++ + targetPowerValT2[ALL_TARGET_HT40_0_8_16] = + ar9003_hw_eeprom_get_ht40_tgt_pwr(ah, HT_TARGET_RATE_0_8_16, freq, + is2GHz) + ht40PowerIncForPdadc; +@@ -4399,6 +4411,26 @@ static void ar9003_hw_set_target_power_e + targetPowerValT2[ALL_TARGET_HT40_23] = + ar9003_hw_eeprom_get_ht40_tgt_pwr(ah, HT_TARGET_RATE_23, freq, + is2GHz) + ht40PowerIncForPdadc; ++} ++ ++static void ar9003_hw_get_target_power_eeprom(struct ath_hw *ah, ++ struct ath9k_channel *chan, ++ u8 *targetPowerValT2) ++{ ++ bool is2GHz = IS_CHAN_2GHZ(chan); ++ unsigned int i = 0; ++ struct ath_common *common = ath9k_hw_common(ah); ++ u16 freq = chan->channel; ++ ++ if (is2GHz) ++ ar9003_hw_get_cck_target_powers(ah, freq, targetPowerValT2); ++ ++ ar9003_hw_get_legacy_target_powers(ah, freq, targetPowerValT2, is2GHz); ++ ar9003_hw_get_ht20_target_powers(ah, freq, targetPowerValT2, is2GHz); ++ ++ if (IS_CHAN_HT40(chan)) ++ ar9003_hw_get_ht40_target_powers(ah, freq, targetPowerValT2, ++ is2GHz); + + for (i = 0; i < ar9300RateSize; i++) { + ath_dbg(common, EEPROM, "TPC[%02d] 0x%08x\n", +@@ -4778,9 +4810,6 @@ static void ar9003_hw_set_power_per_rate + scaledPower = ath9k_hw_get_scaled_power(ah, powerLimit, + antenna_reduction); + +- /* +- * Get target powers from EEPROM - our baseline for TX Power +- */ + if (is2ghz) { + /* Setup for CTL modes */ + /* CTL_11B, CTL_11G, CTL_2GHT20 */ +@@ -4952,7 +4981,12 @@ static void ath9k_hw_ar9300_set_txpower( + unsigned int i = 0, paprd_scale_factor = 0; + u8 pwr_idx, min_pwridx = 0; + +- ar9003_hw_set_target_power_eeprom(ah, chan->channel, targetPowerValT2); ++ memset(targetPowerValT2, 0 , sizeof(targetPowerValT2)); ++ ++ /* ++ * Get target powers from EEPROM - our baseline for TX Power ++ */ ++ ar9003_hw_get_target_power_eeprom(ah, chan, targetPowerValT2); + + if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD)) { + if (IS_CHAN_2GHZ(chan)) --- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c @@ -54,7 +54,7 @@ void ar9003_paprd_enable(struct ath_hw * @@ -153,7 +227,7 @@ REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0, --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c -@@ -524,22 +524,10 @@ static void ar9003_hw_init_bb(struct ath +@@ -526,22 +526,10 @@ static void ar9003_hw_init_bb(struct ath * Value is in 100ns increments. */ synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY; @@ -177,7 +251,7 @@ } static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) -@@ -690,7 +678,7 @@ static int ar9003_hw_process_ini(struct +@@ -692,7 +680,7 @@ static int ar9003_hw_process_ini(struct ar9003_hw_override_ini(ah); ar9003_hw_set_channel_regs(ah, chan); ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask); @@ -186,7 +260,7 @@ if (AR_SREV_9462(ah)) { if (REG_READ_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_0, -@@ -721,6 +709,14 @@ static void ar9003_hw_set_rfmode(struct +@@ -723,6 +711,14 @@ static void ar9003_hw_set_rfmode(struct if (IS_CHAN_A_FAST_CLOCK(ah, chan)) rfMode |= (AR_PHY_MODE_DYNAMIC | AR_PHY_MODE_DYN_CCK_DISABLE); @@ -201,7 +275,7 @@ REG_WRITE(ah, AR_PHY_MODE, rfMode); } -@@ -791,12 +787,8 @@ static bool ar9003_hw_rfbus_req(struct a +@@ -793,12 +789,8 @@ static bool ar9003_hw_rfbus_req(struct a static void ar9003_hw_rfbus_done(struct ath_hw *ah) { u32 synthDelay = REG_READ(ah, AR_PHY_RX_DELAY) & AR_PHY_RX_DELAY_DELAY; @@ -227,84 +301,9 @@ #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A 0x0001FC00 #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_IDX_A_S 10 #define AR_PHY_SPUR_MASK_A_CF_PUNC_MASK_A 0x3FF ---- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h -+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h -@@ -1115,9 +1115,9 @@ static const u32 ar9462_2p0_mac_core[][2 - {0x000081f8, 0x00000000}, - {0x000081fc, 0x00000000}, - {0x00008240, 0x00100000}, -- {0x00008244, 0x0010f400}, -+ {0x00008244, 0x0010f424}, - {0x00008248, 0x00000800}, -- {0x0000824c, 0x0001e800}, -+ {0x0000824c, 0x0001e848}, - {0x00008250, 0x00000000}, - {0x00008254, 0x00000000}, - {0x00008258, 0x00000000}, ---- a/drivers/net/wireless/ath/ath9k/ath9k.h -+++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -370,7 +370,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/beacon.c -+++ b/drivers/net/wireless/ath/ath9k/beacon.c -@@ -91,7 +91,7 @@ static void ath_beacon_setup(struct ath_ - info.txpower = MAX_RATE_POWER; - info.keyix = ATH9K_TXKEYIX_INVALID; - info.keytype = ATH9K_KEY_TYPE_CLEAR; -- info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_INTREQ; -+ info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_CLRDMASK; - - info.buf_addr[0] = bf->bf_buf_addr; - info.buf_len[0] = roundup(skb->len, 4); -@@ -359,6 +359,11 @@ void ath_beacon_tasklet(unsigned long da - int slot; - u32 bfaddr, bc = 0; - -+ if (work_pending(&sc->hw_reset_work)) { -+ ath_dbg(common, RESET, -+ "reset work is pending, skip beaconing now\n"); -+ return; -+ } - /* - * Check if the previous beacon has gone out. If - * not don't try to post another, skip this period -@@ -369,6 +374,9 @@ void ath_beacon_tasklet(unsigned long da - if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) { - sc->beacon.bmisscnt++; - -+ if (!ath9k_hw_check_alive(ah)) -+ ieee80211_queue_work(sc->hw, &sc->hw_check_work); -+ - if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) { - ath_dbg(common, BSTUCK, - "missed %u consecutive beacons\n", -@@ -378,6 +386,7 @@ void ath_beacon_tasklet(unsigned long da - ath9k_hw_bstuck_nfcal(ah); - } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) { - ath_dbg(common, BSTUCK, "beacon is officially stuck\n"); -+ sc->beacon.bmisscnt = 0; - sc->sc_flags |= SC_OP_TSF_RESET; - ieee80211_queue_work(sc->hw, &sc->hw_reset_work); - } -@@ -650,6 +659,8 @@ static void ath_beacon_config_adhoc(stru - u32 tsf, intval, nexttbtt; - - ath9k_reset_beacon_status(sc); -+ if (!(sc->sc_flags & SC_OP_BEACONS)) -+ ath9k_hw_settsf64(ah, sc->beacon.bc_tstamp); - - intval = TU_TO_USEC(conf->beacon_interval); - tsf = roundup(ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE), intval); --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c -@@ -824,6 +824,8 @@ static void ath9k_hw_ar9287_set_txpower( +@@ -798,6 +798,8 @@ static void ath9k_hw_ar9287_set_txpower( regulatory->max_power_level = ratesArray[i]; } @@ -313,21 +312,9 @@ if (test) return; ---- a/drivers/net/wireless/ath/ath9k/gpio.c -+++ b/drivers/net/wireless/ath/ath9k/gpio.c -@@ -41,6 +41,9 @@ void ath_init_leds(struct ath_softc *sc) - { - int ret; - -+ if (AR_SREV_9100(sc->sc_ah)) -+ return; -+ - if (sc->sc_ah->led_pin < 0) { - if (AR_SREV_9287(sc->sc_ah)) - sc->sc_ah->led_pin = ATH_LED_PIN_9287; --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -142,6 +142,22 @@ bool ath9k_hw_wait(struct ath_hw *ah, u3 +@@ -191,6 +191,22 @@ bool ath9k_hw_wait(struct ath_hw *ah, u3 } EXPORT_SYMBOL(ath9k_hw_wait); @@ -350,18 +337,7 @@ void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array, int column, unsigned int *writecnt) { -@@ -388,8 +404,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; -@@ -971,7 +987,7 @@ void ath9k_hw_init_global_settings(struc +@@ -1020,7 +1036,7 @@ void ath9k_hw_init_global_settings(struc struct ath_common *common = ath9k_hw_common(ah); struct ieee80211_conf *conf = &common->hw->conf; const struct ath9k_channel *chan = ah->curchan; @@ -370,7 +346,7 @@ int slottime; int sifstime; int rx_lat = 0, tx_lat = 0, eifs = 0; -@@ -992,6 +1008,11 @@ void ath9k_hw_init_global_settings(struc +@@ -1041,6 +1057,11 @@ void ath9k_hw_init_global_settings(struc rx_lat = 37; tx_lat = 54; @@ -382,7 +358,7 @@ if (IS_CHAN_HALF_RATE(chan)) { eifs = 175; rx_lat *= 2; -@@ -999,8 +1020,9 @@ void ath9k_hw_init_global_settings(struc +@@ -1048,8 +1069,9 @@ void ath9k_hw_init_global_settings(struc if (IS_CHAN_A_FAST_CLOCK(ah, chan)) tx_lat += 11; @@ -393,7 +369,7 @@ } else if (IS_CHAN_QUARTER_RATE(chan)) { eifs = 340; rx_lat = (rx_lat * 4) - 1; -@@ -1008,8 +1030,9 @@ void ath9k_hw_init_global_settings(struc +@@ -1057,8 +1079,9 @@ void ath9k_hw_init_global_settings(struc if (IS_CHAN_A_FAST_CLOCK(ah, chan)) tx_lat += 22; @@ -404,7 +380,7 @@ } else { if (AR_SREV_9287(ah) && AR_SREV_9287_13_OR_LATER(ah)) { eifs = AR_D_GBL_IFS_EIFS_ASYNC_FIFO; -@@ -1023,14 +1046,10 @@ void ath9k_hw_init_global_settings(struc +@@ -1072,14 +1095,10 @@ void ath9k_hw_init_global_settings(struc tx_lat = MS(reg, AR_USEC_TX_LAT); slottime = ah->slottime; @@ -420,7 +396,7 @@ ctstimeout = acktimeout; /* -@@ -1040,7 +1059,8 @@ void ath9k_hw_init_global_settings(struc +@@ -1089,7 +1108,8 @@ void ath9k_hw_init_global_settings(struc * BA frames in some implementations, but it has been found to fix ACK * timeout issues in other cases as well. */ @@ -430,7 +406,7 @@ acktimeout += 64 - sifstime - ah->slottime; ctstimeout += 48 - sifstime - ah->slottime; } -@@ -1420,6 +1440,10 @@ static bool ath9k_hw_channel_change(stru +@@ -1469,6 +1489,10 @@ static bool ath9k_hw_channel_change(stru CHANNEL_5GHZ)); mode_diff = (chan->chanmode != ah->curchan->chanmode); @@ -441,7 +417,7 @@ for (qnum = 0; qnum < AR_NUM_QCU; qnum++) { if (ath9k_hw_numtxpending(ah, qnum)) { ath_dbg(common, QUEUE, -@@ -1453,7 +1477,7 @@ static bool ath9k_hw_channel_change(stru +@@ -1502,7 +1526,7 @@ static bool ath9k_hw_channel_change(stru return false; } ath9k_hw_set_clockrate(ah); @@ -450,7 +426,7 @@ ath9k_hw_rfbus_done(ah); if (IS_CHAN_OFDM(chan) || IS_CHAN_HT(chan)) -@@ -2724,7 +2748,8 @@ static int get_antenna_gain(struct ath_h +@@ -2773,7 +2797,8 @@ static int get_antenna_gain(struct ath_h return ah->eep_ops->get_eeprom(ah, gain_param); } @@ -460,7 +436,7 @@ { struct ath_regulatory *reg = ath9k_hw_regulatory(ah); struct ieee80211_channel *channel; -@@ -2745,7 +2770,7 @@ void ath9k_hw_apply_txpower(struct ath_h +@@ -2794,7 +2819,7 @@ void ath9k_hw_apply_txpower(struct ath_h ah->eep_ops->set_txpower(ah, chan, ath9k_regd_get_ctl(reg, chan), @@ -469,7 +445,7 @@ } void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test) -@@ -2758,7 +2783,7 @@ void ath9k_hw_set_txpowerlimit(struct at +@@ -2807,7 +2832,7 @@ void ath9k_hw_set_txpowerlimit(struct at if (test) channel->max_power = MAX_RATE_POWER / 2; @@ -489,7 +465,7 @@ bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout); void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array, int column, unsigned int *writecnt); -@@ -976,7 +978,8 @@ void ath9k_hw_name(struct ath_hw *ah, ch +@@ -982,7 +984,8 @@ void ath9k_hw_name(struct ath_hw *ah, ch /* PHY */ void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled, u32 *coef_mantissa, u32 *coef_exponent); @@ -499,6 +475,43 @@ /* * Code Specific to AR5008, AR9001 or AR9002, +--- a/drivers/net/wireless/ath/ath9k/init.c ++++ b/drivers/net/wireless/ath/ath9k/init.c +@@ -647,6 +647,24 @@ void ath9k_reload_chainmask_settings(str + setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap); + } + ++static const struct ieee80211_iface_limit if_limits[] = { ++ { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) | ++ BIT(NL80211_IFTYPE_P2P_CLIENT) | ++ BIT(NL80211_IFTYPE_WDS) }, ++ { .max = 8, .types = ++#ifdef CONFIG_MAC80211_MESH ++ BIT(NL80211_IFTYPE_MESH_POINT) | ++#endif ++ BIT(NL80211_IFTYPE_AP) | ++ BIT(NL80211_IFTYPE_P2P_GO) }, ++}; ++ ++static const struct ieee80211_iface_combination if_comb = { ++ .limits = if_limits, ++ .n_limits = ARRAY_SIZE(if_limits), ++ .max_interfaces = 2048, ++ .num_different_channels = 1, ++}; + + void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) + { +@@ -676,6 +694,9 @@ void ath9k_set_hw_capab(struct ath_softc + BIT(NL80211_IFTYPE_ADHOC) | + BIT(NL80211_IFTYPE_MESH_POINT); + ++ hw->wiphy->iface_combinations = &if_comb; ++ hw->wiphy->n_iface_combinations = 1; ++ + if (AR_SREV_5416(sc->sc_ah)) + hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; + --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c @@ -133,8 +133,16 @@ EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel @@ -527,26 +540,6 @@ if (i) udelay(5); ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -692,17 +692,6 @@ void ath9k_tasklet(unsigned long data) - goto out; - } - -- /* -- * Only run the baseband hang check if beacons stop working in AP or -- * IBSS mode, because it has a high false positive rate. For station -- * mode it should not be necessary, since the upper layers will detect -- * this through a beacon miss automatically and the following channel -- * change will trigger a hardware reset anyway -- */ -- if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0 && -- !ath9k_hw_check_alive(ah)) -- ieee80211_queue_work(sc->hw, &sc->hw_check_work); -- - if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) { - /* - * TSF sync does not look correct; remain awake to sync with --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -200,6 +200,8 @@ static void ieee80211_send_addba_resp(st @@ -596,17 +589,7 @@ TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT), --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -163,7 +163,8 @@ static int ieee80211_check_queues(struct - return -EINVAL; - } - -- if (sdata->vif.type != NL80211_IFTYPE_AP) { -+ if ((sdata->vif.type != NL80211_IFTYPE_AP) || -+ !(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) { - sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE; - return 0; - } -@@ -281,7 +282,6 @@ static int ieee80211_do_open(struct net_ +@@ -282,7 +282,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; @@ -614,7 +597,7 @@ u32 changed = 0; int res; u32 hw_reconf_flags = 0; -@@ -427,28 +427,6 @@ static int ieee80211_do_open(struct net_ +@@ -428,28 +427,6 @@ static int ieee80211_do_open(struct net_ set_bit(SDATA_STATE_RUNNING, &sdata->state); @@ -643,7 +626,7 @@ /* * set_multicast_list will be invoked by the networking core * which will check whether any increments here were done in -@@ -845,6 +823,70 @@ static void ieee80211_if_setup(struct ne +@@ -846,6 +823,72 @@ static void ieee80211_if_setup(struct ne dev->destructor = free_netdev; } @@ -703,7 +686,9 @@ + set_sta_flag(sta, WLAN_STA_WME); + + if (new) { -+ set_sta_flag(sta, WLAN_STA_AUTHORIZED); ++ sta_info_pre_move_state(sta, IEEE80211_STA_AUTH); ++ sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC); ++ sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED); + rate_control_rate_init(sta); + sta_info_insert_rcu(sta); + } @@ -714,7 +699,7 @@ static void ieee80211_iface_work(struct work_struct *work) { struct ieee80211_sub_if_data *sdata = -@@ -949,6 +991,9 @@ static void ieee80211_iface_work(struct +@@ -950,6 +993,9 @@ static void ieee80211_iface_work(struct break; ieee80211_mesh_rx_queued_mgmt(sdata, skb); break; @@ -726,35 +711,7 @@ break; --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -103,7 +103,7 @@ static void - ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, - struct sk_buff *skb, - struct ieee80211_rate *rate, -- int rtap_len) -+ int rtap_len, bool has_fcs) - { - struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); - struct ieee80211_radiotap_header *rthdr; -@@ -134,7 +134,7 @@ ieee80211_add_rx_radiotap_header(struct - } - - /* IEEE80211_RADIOTAP_FLAGS */ -- if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS) -+ if (has_fcs && (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)) - *pos |= IEEE80211_RADIOTAP_F_FCS; - if (status->flag & (RX_FLAG_FAILED_FCS_CRC | RX_FLAG_FAILED_PLCP_CRC)) - *pos |= IEEE80211_RADIOTAP_F_BADFCS; -@@ -294,7 +294,8 @@ ieee80211_rx_monitor(struct ieee80211_lo - } - - /* prepend radiotap information */ -- ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom); -+ ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom, -+ true); - - skb_reset_mac_header(skb); - skb->ip_summed = CHECKSUM_UNNECESSARY; -@@ -2282,6 +2283,7 @@ ieee80211_rx_h_action(struct ieee80211_r +@@ -2283,6 +2283,7 @@ ieee80211_rx_h_action(struct ieee80211_r sdata->vif.type != NL80211_IFTYPE_MESH_POINT && sdata->vif.type != NL80211_IFTYPE_AP_VLAN && sdata->vif.type != NL80211_IFTYPE_AP && @@ -762,7 +719,7 @@ sdata->vif.type != NL80211_IFTYPE_ADHOC) break; -@@ -2496,14 +2498,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ +@@ -2497,14 +2498,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ if (!ieee80211_vif_is_mesh(&sdata->vif) && sdata->vif.type != NL80211_IFTYPE_ADHOC && @@ -780,17 +737,7 @@ break; case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP): case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP): -@@ -2567,7 +2570,8 @@ static void ieee80211_rx_cooked_monitor( - goto out_free_skb; - - /* prepend radiotap information */ -- ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom); -+ ieee80211_add_rx_radiotap_header(local, skb, rate, needed_headroom, -+ false); - - skb_set_mac_header(skb, 0); - skb->ip_summed = CHECKSUM_UNNECESSARY; -@@ -2836,10 +2840,16 @@ static int prepare_for_handlers(struct i +@@ -2838,10 +2840,16 @@ static int prepare_for_handlers(struct i } break; case NL80211_IFTYPE_WDS: @@ -827,53 +774,31 @@ WLAN_STA_CLEAR_PS_FILT, WLAN_STA_MFP, WLAN_STA_BLOCK_BA, ---- a/drivers/net/wireless/ath/ath9k/init.c -+++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -647,6 +647,24 @@ void ath9k_reload_chainmask_settings(str - setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap); - } - -+static const struct ieee80211_iface_limit if_limits[] = { -+ { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) | -+ BIT(NL80211_IFTYPE_P2P_CLIENT) | -+ BIT(NL80211_IFTYPE_WDS) }, -+ { .max = 8, .types = -+#ifdef CONFIG_MAC80211_MESH -+ BIT(NL80211_IFTYPE_MESH_POINT) | -+#endif -+ BIT(NL80211_IFTYPE_AP) | -+ BIT(NL80211_IFTYPE_P2P_GO) }, -+}; -+ -+static const struct ieee80211_iface_combination if_comb = { -+ .limits = if_limits, -+ .n_limits = ARRAY_SIZE(if_limits), -+ .max_interfaces = 2048, -+ .num_different_channels = 1, -+}; - - void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) - { -@@ -676,6 +694,9 @@ void ath9k_set_hw_capab(struct ath_softc - BIT(NL80211_IFTYPE_ADHOC) | - BIT(NL80211_IFTYPE_MESH_POINT); - -+ hw->wiphy->iface_combinations = &if_comb; -+ hw->wiphy->n_iface_combinations = 1; -+ - if (AR_SREV_5416(sc->sc_ah)) - hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; - ---- a/net/mac80211/ibss.c -+++ b/net/mac80211/ibss.c -@@ -455,8 +455,8 @@ static void ieee80211_rx_bss_info(struct - * fall back to HT20 if we don't use or use - * the other extension channel - */ -- if ((channel_type == NL80211_CHAN_HT40MINUS || -- channel_type == NL80211_CHAN_HT40PLUS) && -+ if (!(channel_type == NL80211_CHAN_HT40MINUS || -+ channel_type == NL80211_CHAN_HT40PLUS) || - channel_type != sdata->u.ibss.channel_type) - sta_ht_cap_new.cap &= - ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; +--- a/drivers/net/wireless/iwlwifi/iwl-agn.h ++++ b/drivers/net/wireless/iwlwifi/iwl-agn.h +@@ -425,6 +425,7 @@ void iwl_testmode_cleanup(struct iwl_pri + #ifdef CONFIG_IWLWIFI_DEBUG + void iwl_print_rx_config_cmd(struct iwl_priv *priv, + enum iwl_rxon_context_id ctxid); ++int iwl_alloc_traffic_mem(struct iwl_priv *priv); + #else + static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv, + enum iwl_rxon_context_id ctxid) +@@ -510,7 +511,6 @@ void iwl_setup_deferred_work(struct iwl_ + int iwl_send_wimax_coex(struct iwl_priv *priv); + int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type); + void iwl_debug_config(struct iwl_priv *priv); +-int iwl_alloc_traffic_mem(struct iwl_priv *priv); + void iwl_set_hw_params(struct iwl_priv *priv); + void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags); + int iwl_init_drv(struct iwl_priv *priv); +--- a/drivers/net/wireless/libertas/firmware.c ++++ b/drivers/net/wireless/libertas/firmware.c +@@ -5,6 +5,7 @@ + #include <linux/firmware.h> + #include <linux/firmware.h> + #include <linux/module.h> ++#include <linux/sched.h> + + #include "dev.h" + #include "decl.h" diff --git a/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch index 7018bf387a..c78b51a257 100644 --- a/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch +++ b/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch @@ -8,7 +8,7 @@ #include <asm/unaligned.h> #include "hw.h" -@@ -482,8 +483,16 @@ static int ath9k_hw_init_macaddr(struct +@@ -531,8 +532,16 @@ static int ath9k_hw_init_macaddr(struct common->macaddr[2 * i] = eeval >> 8; common->macaddr[2 * i + 1] = eeval & 0xff; } diff --git a/package/mac80211/patches/405-regd_no_assoc_hints.patch b/package/mac80211/patches/405-regd_no_assoc_hints.patch index fc7ccc6b2b..577275d26c 100644 --- a/package/mac80211/patches/405-regd_no_assoc_hints.patch +++ b/package/mac80211/patches/405-regd_no_assoc_hints.patch @@ -1,6 +1,6 @@ --- a/net/wireless/reg.c +++ b/net/wireless/reg.c -@@ -1698,6 +1698,8 @@ void regulatory_hint_11d(struct wiphy *w +@@ -1699,6 +1699,8 @@ void regulatory_hint_11d(struct wiphy *w enum environment_cap env = ENVIRON_ANY; struct regulatory_request *request; @@ -9,7 +9,7 @@ mutex_lock(®_mutex); if (unlikely(!last_request)) -@@ -1933,6 +1935,8 @@ static void restore_regulatory_settings( +@@ -1934,6 +1936,8 @@ static void restore_regulatory_settings( void regulatory_hint_disconnect(void) { diff --git a/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch b/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch index 36b2c1c9f0..474b0125bb 100644 --- a/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch +++ b/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch @@ -8,7 +8,7 @@ #include "../ath.h" #include "ath5k.h" #include "debug.h" -@@ -72,7 +73,7 @@ static void ath5k_pci_read_cachesize(str +@@ -73,7 +74,7 @@ static void ath5k_pci_read_cachesize(str } /* @@ -17,7 +17,7 @@ */ static bool ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data) -@@ -80,6 +81,19 @@ ath5k_pci_eeprom_read(struct ath_common +@@ -81,6 +82,19 @@ ath5k_pci_eeprom_read(struct ath_common struct ath5k_hw *ah = (struct ath5k_hw *) common->ah; u32 status, timeout; @@ -37,7 +37,7 @@ /* * Initialize EEPROM access */ -@@ -123,6 +137,16 @@ static int ath5k_pci_eeprom_read_mac(str +@@ -124,6 +138,16 @@ static int ath5k_pci_eeprom_read_mac(str u16 data; int octet; diff --git a/package/mac80211/patches/432-ath5k_add_pciids.patch b/package/mac80211/patches/432-ath5k_add_pciids.patch index 07530876df..15977db9a6 100644 --- a/package/mac80211/patches/432-ath5k_add_pciids.patch +++ b/package/mac80211/patches/432-ath5k_add_pciids.patch @@ -6,6 +6,6 @@ { PCI_VDEVICE(ATHEROS, 0x001d) }, /* 2417 Nala */ + { PCI_VDEVICE(ATHEROS, 0xff16) }, /* 2413,2414 sx76x on lantiq_danube */ + { PCI_VDEVICE(ATHEROS, 0xff1a) }, /* 2417 arv45xx on lantiq_danube */ + { PCI_VDEVICE(ATHEROS, 0xff1b) }, /* AR5BXB63 */ { 0 } }; - MODULE_DEVICE_TABLE(pci, ath5k_pci_id_table); diff --git a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch index 05481093ed..49e80ca3e6 100644 --- a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch +++ b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1544,6 +1544,53 @@ static const struct file_operations fops +@@ -1532,6 +1532,53 @@ static const struct file_operations fops #endif @@ -54,7 +54,7 @@ int ath9k_init_debug(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); -@@ -1607,5 +1654,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1595,5 +1642,8 @@ int ath9k_init_debug(struct ath_hw *ah) debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy, &sc->sc_ah->gpio_val); diff --git a/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch b/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch index 27c99c9603..bc0a731a1f 100644 --- a/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch +++ b/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1887,8 +1887,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -1936,8 +1936,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st REG_WRITE(ah, AR_OBS, 8); if (ah->config.rx_intr_mitigation) { diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch index 7ab8625078..348ab21b95 100644 --- a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch +++ b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch @@ -18,7 +18,7 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1591,6 +1591,50 @@ static const struct file_operations fops +@@ -1579,6 +1579,50 @@ static const struct file_operations fops .owner = THIS_MODULE }; @@ -69,7 +69,7 @@ int ath9k_init_debug(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); -@@ -1657,5 +1701,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1645,5 +1689,8 @@ int ath9k_init_debug(struct ath_hw *ah) debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc, &fops_eeprom); diff --git a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch index acaea62f0c..1b7782cf82 100644 --- a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch +++ b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch @@ -187,7 +187,7 @@ /* Record packet only when both main_rssi and alt_rssi is positive */ --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c -@@ -453,12 +453,12 @@ int ath9k_hw_process_rxdesc_edma(struct +@@ -455,12 +455,12 @@ int ath9k_hw_process_rxdesc_edma(struct /* XXX: Keycache */ rxs->rs_rssi = MS(rxsp->status5, AR_RxRSSICombined); @@ -248,7 +248,7 @@ if (ads.ds_rxstatus8 & AR_RxKeyIdxValid) --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1009,12 +1009,12 @@ void ath_debug_stat_rx(struct ath_softc +@@ -997,12 +997,12 @@ void ath_debug_stat_rx(struct ath_softc #ifdef CONFIG_ATH9K_MAC_DEBUG spin_lock(&sc->debug.samp_lock); RX_SAMP_DBG(jiffies) = jiffies; diff --git a/package/mac80211/patches/530-ath9k_limit_qlen.patch b/package/mac80211/patches/530-ath9k_limit_qlen.patch index 5c649ce0ee..5a9275ba73 100644 --- a/package/mac80211/patches/530-ath9k_limit_qlen.patch +++ b/package/mac80211/patches/530-ath9k_limit_qlen.patch @@ -20,7 +20,7 @@ spinlock_t txbuflock; --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1658,6 +1658,10 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1646,6 +1646,10 @@ int ath9k_init_debug(struct ath_hw *ah) &fops_interrupt); debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc, &fops_xmit); @@ -74,7 +74,7 @@ /* Queue to h/w without aggregation */ TX_STAT_INC(txctl->txq->axq_qnum, a_queued_hw); bf->bf_lastbf = bf; -@@ -1861,22 +1874,11 @@ error: +@@ -1869,22 +1882,11 @@ error: /* FIXME: tx power */ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb, @@ -99,7 +99,7 @@ if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) { /* -@@ -1908,6 +1910,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1916,6 +1918,7 @@ int ath_tx_start(struct ieee80211_hw *hw struct ieee80211_vif *vif = info->control.vif; struct ath_softc *sc = hw->priv; struct ath_txq *txq = txctl->txq; @@ -107,7 +107,7 @@ int padpos, padsize; int frmlen = skb->len + FCS_LEN; int q; -@@ -1950,6 +1953,24 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1958,6 +1961,24 @@ int ath_tx_start(struct ieee80211_hw *hw setup_frame_info(hw, skb, frmlen); @@ -132,7 +132,7 @@ /* * At this point, the vif, hw_key and sta pointers in the tx control * info are no longer valid (overwritten by the ath_frame_info data. -@@ -1964,7 +1985,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1972,7 +1993,7 @@ int ath_tx_start(struct ieee80211_hw *hw txq->stopped = true; } diff --git a/package/mac80211/patches/540-ath9k_extra_leds.patch b/package/mac80211/patches/540-ath9k_extra_leds.patch index 6ba952c83f..30094cd53a 100644 --- a/package/mac80211/patches/540-ath9k_extra_leds.patch +++ b/package/mac80211/patches/540-ath9k_extra_leds.patch @@ -182,7 +182,7 @@ #endif --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1267,6 +1267,61 @@ static const struct file_operations fops +@@ -1255,6 +1255,61 @@ static const struct file_operations fops .llseek = default_llseek, }; @@ -244,7 +244,7 @@ #ifdef CONFIG_ATH9K_MAC_DEBUG void ath9k_debug_samp_bb_mac(struct ath_softc *sc) -@@ -1696,6 +1751,11 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1684,6 +1739,11 @@ int ath9k_init_debug(struct ath_hw *ah) &fops_samps); #endif diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch index a7a0b6f5b7..eca2edfd92 100644 --- a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch +++ b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch @@ -239,7 +239,7 @@ .get_entry_state = rt2800pci_get_entry_state, --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c -@@ -1160,6 +1160,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de +@@ -1161,6 +1161,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de BIT(NL80211_IFTYPE_MESH_POINT) | BIT(NL80211_IFTYPE_WDS); @@ -250,7 +250,7 @@ /* * Initialize work. */ -@@ -1284,6 +1288,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ +@@ -1285,6 +1289,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ */ if (rt2x00dev->drv_data) kfree(rt2x00dev->drv_data); diff --git a/package/mac80211/patches/604-rt2x00-add-CONFIG_RT2X00_LIB_EEPROM-option.patch b/package/mac80211/patches/604-rt2x00-add-CONFIG_RT2X00_LIB_EEPROM-option.patch index aaf0a5ab32..d76651038d 100644 --- a/package/mac80211/patches/604-rt2x00-add-CONFIG_RT2X00_LIB_EEPROM-option.patch +++ b/package/mac80211/patches/604-rt2x00-add-CONFIG_RT2X00_LIB_EEPROM-option.patch @@ -6,5 +6,5 @@ export CONFIG_RT2X00_LIB_FIRMWARE=y +export CONFIG_RT2X00_LIB_EEPROM=y export CONFIG_RT2X00_LIB_CRYPTO=y - # CONFIG_RT2X00_LIB_SOC=y + # export CONFIG_RT2X00_LIB_SOC=y ifdef CONFIG_COMPAT_KERNEL_2_6_25 diff --git a/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch index 476f730116..57abb07ab6 100644 --- a/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch +++ b/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch @@ -12,7 +12,7 @@ #endif /* _RT2X00_PLATFORM_H */ --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c -@@ -833,6 +833,22 @@ static int rt2x00lib_probe_hw_modes(stru +@@ -834,6 +834,22 @@ static int rt2x00lib_probe_hw_modes(stru unsigned int num_rates; unsigned int i; |