pull request: wireless 2012-02-27
Subsystems (5)
commit eea79e0713d94b02952f6c591b615710fd40a562
Dave,
This is a batch of fixes intended for 3.3.
The biggest fix comes from Felix, where he moves around some code in ath9k in order to avoid a crash reported to him by a user on IRC. Also included is an rt2x00 fix from Gabor Juhos for a possible NULL pointer dereference, an iwlwifi fix from Johannes Berg for a bug that led to incorrectly removing unicast keys (and dropping connections), a mac80211 fix from Mohammed Shafi Shajakhan to properly initialize a structure used by the rate control algorithms, another mac80211 fix from Mohammed to avoid a WARNING when changing from monitor mode to managed mode, a brcmsmac fix from Arend van Spriel to avoid an endless retry of A-MPDU retransmits, and another fix from Arend to avoid some log spam coming from brcmsmac.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 203738e548cefc3fc3c2f73a9063176c9f3583d5:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2012-02-26 12:47:17 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
Arend van Spriel (2):
brcm80211: smac: fix endless retry of A-MPDU transmissions
brcm80211: smac: only print block-ack timeout message at trace level
Felix Fietkau (1):
ath9k_hw: prevent writes to const data on AR9160
Gabor Juhos (1):
rt2x00: fix a possible NULL pointer dereference
Johannes Berg (1):
iwlwifi: fix key removal
John W. Linville (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Mohammed Shafi Shajakhan (2):
mac80211: zero initialize count field in ieee80211_tx_rate
mac80211: Fix a warning on changing to monitor mode from STA
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 25 +---------------------- drivers/net/wireless/ath/ath9k/ar9002_hw.c | 19 +++++++++++++++++ drivers/net/wireless/ath/ath9k/hw.h | 1 - drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 12 +++------- drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 10 ++++++++- drivers/net/wireless/rt2x00/rt2x00dev.c | 3 +- net/mac80211/iface.c | 3 ++ net/mac80211/rate.c | 2 +- 8 files changed, 39 insertions(+), 36 deletions(-)
drivers/net/wireless/ath/ath9k/ar5008_phy.c +1 -24
@@ -489,8 +489,6 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)ATH_ALLOC_BANK (ah->analogBank6Data, ah->iniBank6.ia_rows);ATH_ALLOC_BANK (ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);ATH_ALLOC_BANK (ah->analogBank7Data, ah->iniBank7.ia_rows); -ATH_ALLOC_BANK (ah->addac5416_21, - ah->iniAddac.ia_rows * ah->iniAddac.ia_columns);ATH_ALLOC_BANK (ah->bank6Temp, ah->iniBank6.ia_rows);return 0 ;
@@ -519,7 +517,6 @@ static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah)ATH_FREE_BANK (ah->analogBank6Data);ATH_FREE_BANK (ah->analogBank6TPCData);ATH_FREE_BANK (ah->analogBank7Data); -ATH_FREE_BANK (ah->addac5416_21);ATH_FREE_BANK (ah->bank6Temp);#undef ATH_FREE_BANK
@@ -805,27 +802,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,if (ah->eep_ops->set_addac) ah->eep_ops->set_addac (ah, chan); -if (AR_SREV_5416_22_OR_LATER (ah)) { -REG_WRITE_ARRAY (&ah->iniAddac,1 , regWrites); - }else { -struct ar5416IniArray temp; -u32 addacSize = -sizeof (u32) * ah->iniAddac.ia_rows * - ah->iniAddac.ia_columns; - -/* For AR5416 2.0/2.1 */ -memcpy (ah->addac5416_21, - ah->iniAddac.ia_array, addacSize); - -/* override CLKDRV value at [row, column] = [31, 1] */ - (ah->addac5416_21)[31 * ah->iniAddac.ia_columns +1 ] =0 ; - - temp.ia_array = ah->addac5416_21; - temp.ia_columns = ah->iniAddac.ia_columns; - temp.ia_rows = ah->iniAddac.ia_rows; -REG_WRITE_ARRAY (&temp,1 , regWrites); - } - +REG_WRITE_ARRAY (&ah->iniAddac,1 , regWrites);REG_WRITE (ah,AR_PHY_ADC_SERIAL_CTL ,AR_PHY_SEL_INTERNAL_ADDAC );ENABLE_REGWRITE_BUFFER (ah);
drivers/net/wireless/ath/ath9k/ar9002_hw.c +19 -0
@@ -180,6 +180,25 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)INIT_INI_ARRAY (&ah->iniAddac, ar5416Addac,ARRAY_SIZE (ar5416Addac),2 ); } + +/* iniAddac needs to be modified for these chips */ +if (AR_SREV_9160 (ah) || !AR_SREV_5416_22_OR_LATER (ah)) { +struct ar5416IniArray *addac = &ah->iniAddac; +u32 size =sizeof (u32) * addac->ia_rows * addac->ia_columns; +u32 *data; + + data =kmalloc (size,GFP_KERNEL ); +if (!data) +return ; + +memcpy (data, addac->ia_array, size); + addac->ia_array = data; + +if (!AR_SREV_5416_22_OR_LATER (ah)) { +/* override CLKDRV value */ +INI_RA (addac,31 ,1 ) =0 ; + } + } }/* Support for Japan ch.14 (2484) spread */
drivers/net/wireless/ath/ath9k/hw.h +0 -1
@@ -940,7 +940,6 @@ struct ath_hw {u32 *analogBank6Data;u32 *analogBank6TPCData;u32 *analogBank7Data; -u32 *addac5416_21;u32 *bank6Temp;u8 txpower_limit;
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c +4 -8
@@ -1051,17 +1051,13 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, }/* either retransmit or send bar if ack not recd */ if (!ack_recd) { -struct ieee80211_tx_rate *txrate = - tx_info->status.rates; -if (retry && (txrate[0 ].count < (int )retry_limit)) { +if (retry && (ini->txretry[index] < (int )retry_limit)) { ini->txretry[index]++; ini->tx_in_transit--;/* * Use high prededence for retransmit to * give some punch */ -/* brcms_c_txq_enq(wlc, scb, p, -* BRCMS_PRIO_TO_PREC(tid)); */ brcms_c_txq_enq (wlc, scb, p,BRCMS_PRIO_TO_HI_PREC (tid)); }else {
@@ -1074,9 +1070,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,IEEE80211_TX_STAT_AMPDU_NO_BACK ;skb_pull (p,D11_PHY_HDR_LEN );skb_pull (p,D11_TXH_LEN ); -wiphy_err (wiphy,"%s: BA Timeout, seq %d, in_" -"transit %d\n" ,"AMPDU status" , seq, - ini->tx_in_transit); +BCMMSG (wiphy, +"BA Timeout, seq %d, in_transit %d\n" , + seq, ini->tx_in_transit);ieee80211_tx_status_irqsafe (wlc->pub->ieee_hw, p); }
drivers/net/wireless/iwlwifi/iwl-agn-sta.c +9 -1
@@ -1187,6 +1187,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,unsigned long flags;struct iwl_addsta_cmd sta_cmd;u8 sta_id =iwlagn_key_sta_id (priv, ctx->vif, sta); +__le16 key_flags;/* if station isn't there, neither is the key */ if (sta_id ==IWL_INVALID_STATION )
@@ -1212,7 +1213,14 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,IWL_ERR (priv,"offset %d not used in uCode key table.\n" , keyconf->hw_key_idx); - sta_cmd.key.key_flags =STA_KEY_FLG_NO_ENC |STA_KEY_FLG_INVALID ; + key_flags =cpu_to_le16 (keyconf->keyidx <<STA_KEY_FLG_KEYID_POS ); + key_flags |=STA_KEY_FLG_MAP_KEY_MSK |STA_KEY_FLG_NO_ENC | +STA_KEY_FLG_INVALID ; + +if (!(keyconf->flags &IEEE80211_KEY_FLAG_PAIRWISE )) + key_flags |=STA_KEY_MULTICAST_MSK ; + + sta_cmd.key.key_flags = key_flags; sta_cmd.key.key_offset =WEP_INVALID_OFFSET ; sta_cmd.sta.modify_mask =STA_MODIFY_KEY_MASK ; sta_cmd.mode =STA_CONTROL_MODIFY_MSK ;
drivers/net/wireless/rt2x00/rt2x00dev.c +2 -1
@@ -1220,7 +1220,8 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)cancel_work_sync (&rt2x00dev->rxdone_work);cancel_work_sync (&rt2x00dev->txdone_work); } -destroy_workqueue (rt2x00dev->workqueue); +if (rt2x00dev->workqueue) +destroy_workqueue (rt2x00dev->workqueue);/* * Free the tx status fifo.
net/mac80211/iface.c +3 -0
@@ -1332,6 +1332,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) hw_roc = true;list_for_each_entry (sdata, &local->interfaces, list) { +if (sdata->vif.type ==NL80211_IFTYPE_MONITOR || + sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) +continue ;if (sdata->old_idle == sdata->vif.bss_conf.idle)continue ;if (!ieee80211_sdata_running (sdata))
net/mac80211/rate.c +1 -1
@@ -344,7 +344,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,for (i =0 ; i <IEEE80211_TX_MAX_RATES ; i++) { info->control.rates[i].idx =-1 ; info->control.rates[i].flags =0 ; - info->control.rates[i].count =1 ; + info->control.rates[i].count =0 ; }if (sdata->local->hw.flags &IEEE80211_HW_HAS_RATE_CONTROL )
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Mon, 27 Feb 2012 15:15:07 -0500
Quoted 13 lines
This is a batch of fixes intended for 3.3.
The biggest fix comes from Felix, where he moves around some code in ath9k in order to avoid a crash reported to him by a user on IRC. Also included is an rt2x00 fix from Gabor Juhos for a possible NULL pointer dereference, an iwlwifi fix from Johannes Berg for a bug that led to incorrectly removing unicast keys (and dropping connections), a mac80211 fix from Mohammed Shafi Shajakhan to properly initialize a structure used by the rate control algorithms, another mac80211 fix from Mohammed to avoid a WARNING when changing from monitor mode to managed mode, a brcmsmac fix from Arend van Spriel to avoid an endless retry of A-MPDU retransmits, and another fix from Arend to avoid some log spam coming from brcmsmac.
Pulled, thanks John.