X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c98e83d466b041b49835a136e86421f9acec6331..372c8c5e681428d331d44a08fdc4e9921090c8fb:/package/mac80211/patches/525-ath9k_handle_keymiss.patch

diff --git a/package/mac80211/patches/525-ath9k_handle_keymiss.patch b/package/mac80211/patches/525-ath9k_handle_keymiss.patch
index a2031cf46..bbdd17761 100644
--- a/package/mac80211/patches/525-ath9k_handle_keymiss.patch
+++ b/package/mac80211/patches/525-ath9k_handle_keymiss.patch
@@ -1,23 +1,23 @@
 --- a/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
- 		rs->rs_flags |= ATH9K_RX_DELIM_CRC_POST;
- 	if (ads.ds_rxstatus8 & AR_DecryptBusyErr)
- 		rs->rs_flags |= ATH9K_RX_DECRYPT_BUSY;
-+	if (ads.ds_rxstatus8 & AR_KeyMiss)
-+		rs->rs_keyix = ATH9K_RXKEYIX_INVALID;
+@@ -713,6 +713,8 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
+ 			rs->rs_status |= ATH9K_RXERR_DECRYPT;
+ 		else if (ads.ds_rxstatus8 & AR_MichaelErr)
+ 			rs->rs_status |= ATH9K_RXERR_MIC;
++		else if (ads.ds_rxstatus8 & AR_KeyMiss)
++			rs->rs_status |= ATH9K_RXERR_DECRYPT;
+ 	}
  
- 	if ((ads.ds_rxstatus8 & AR_RxFrameOK) == 0) {
- 		if (ads.ds_rxstatus8 & AR_CRCErr)
+ 	return 0;
 --- a/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 
- 	if (rxsp->status11 & AR_DecryptBusyErr)
- 		rxs->rs_flags |= ATH9K_RX_DECRYPT_BUSY;
+@@ -589,7 +589,8 @@ int ath9k_hw_process_rxdesc_edma(struct 
+ 			rxs->rs_status |= ATH9K_RXERR_DECRYPT;
+ 		} 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)
-+		rxs->rs_keyix = ATH9K_RXKEYIX_INVALID;
-+
- 	if ((rxsp->status11 & AR_RxFrameOK) == 0) {
- 		if (rxsp->status11 & AR_CRCErr) {
- 			rxs->rs_status |= ATH9K_RXERR_CRC;
+ 	return 0;