KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: improve reliability of the keymiss handling fix, add another aggregation leak fix

Browse source 
SVN-Revision: 22152
This commit is contained in:
Felix Fietkau 2010-07-12 19:16:22 +00:00
parent b9dfb5d483
commit d0e2e4f693
2 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
package/mac80211/patches/525-ath9k_handle_keymiss.patch
View file

@ -1,23 +1,23 @@
--- a/drivers/net/wireless/ath/ath9k/mac.c --- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -701,6 +701,8 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a @@ -713,6 +713,8 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
rs->rs_flags |= ATH9K_RX_DELIM_CRC_POST; rs->rs_status |= ATH9K_RXERR_DECRYPT;
if (ads.ds_rxstatus8 & AR_DecryptBusyErr) else if (ads.ds_rxstatus8 & AR_MichaelErr)
rs->rs_flags |= ATH9K_RX_DECRYPT_BUSY; rs->rs_status |= ATH9K_RXERR_MIC;
+ if (ads.ds_rxstatus8 & AR_KeyMiss) + else if (ads.ds_rxstatus8 & AR_KeyMiss)
+ rs->rs_keyix = ATH9K_RXKEYIX_INVALID; + rs->rs_status |= ATH9K_RXERR_DECRYPT;
}
if ((ads.ds_rxstatus8 & AR_RxFrameOK) == 0) { return 0;
if (ads.ds_rxstatus8 & AR_CRCErr)
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -578,6 +578,9 @@ int ath9k_hw_process_rxdesc_edma(struct @@ -589,7 +589,8 @@ int ath9k_hw_process_rxdesc_edma(struct
if (rxsp->status11 & AR_DecryptBusyErr) rxs->rs_status |= ATH9K_RXERR_DECRYPT;
rxs->rs_flags |= ATH9K_RX_DECRYPT_BUSY; } else if (rxsp->status11 & AR_MichaelErr) {
rxs->rs_status |= ATH9K_RXERR_MIC;
- }
+ } else if (rxsp->status11 & AR_KeyMiss)
+ rxs->rs_status |= ATH9K_RXERR_DECRYPT;
}
+ if (rxsp->status11 & AR_KeyMiss) return 0;
+ rxs->rs_keyix = ATH9K_RXKEYIX_INVALID;
+
if ((rxsp->status11 & AR_RxFrameOK) == 0) {
if (rxsp->status11 & AR_CRCErr) {
rxs->rs_status |= ATH9K_RXERR_CRC;

35
package/mac80211/patches/540-ath9k_aggr_fix.patch Normal file
View file

@ -0,0 +1,35 @@
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -329,7 +329,6 @@ static void ath_tx_complete_aggr(struct
int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
bool rc_update = true;
struct ieee80211_tx_rate rates[4];
- unsigned long flags;
skb = bf->bf_mpdu;
hdr = (struct ieee80211_hdr *)skb->data;
@@ -346,9 +345,21 @@ static void ath_tx_complete_aggr(struct
if (!sta) {
rcu_read_unlock();
- spin_lock_irqsave(&sc->tx.txbuflock, flags);
- list_splice_tail_init(bf_q, &sc->tx.txbuf);
- spin_unlock_irqrestore(&sc->tx.txbuflock, flags);
+ INIT_LIST_HEAD(&bf_head);
+ while (bf) {
+ bf_next = bf->bf_next;
+
+ bf->bf_state.bf_type |= BUF_XRETRY;
+ if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) ||
+ !bf->bf_stale || bf_next != NULL)
+ list_move_tail(&bf->list, &bf_head);
+
+ ath_tx_rc_status(bf, ts, 0, 0, false);
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
+ 0, 0);
+
+ bf = bf_next;
+ }
return;
}