ath9k: connectivity is lost after Group rekeying is done
PATCH 1/1 ath9k: connectivity is lost after Group rekeying is done
Connectivtiy is lost after Group rekeying is done. The keytype maintained by ath9k is reset when group key is updated. Though sc_keytype can be reset only for broadcast key the proper fix would be to use mac80211 provided key type from txinfo during xmit and get rid of sc_keytype from ath9k ath_softc.
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
Signed-off-by Senthil Balasubramanian <[email protected]>
--- drivers/net/wireless/ath9k/core.h | 1 - drivers/net/wireless/ath9k/main.c | 3 --- drivers/net/wireless/ath9k/xmit.c | 6 +++--- 3 files changed, 3 insertions(+), 7 deletions(-)
drivers/net/wireless/ath9k/core.h +0 -1
@@ -976,7 +976,6 @@ struct ath_softc {u32 sc_keymax;/* size of key cache */ DECLARE_BITMAP (sc_keymap,ATH_KEYMAX );/* key use bit map */ u8 sc_splitmic;/* split TKIP MIC keys */ -int sc_keytype;/* RX */ struct list_head sc_rxbuf;
drivers/net/wireless/ath9k/main.c +0 -3
@@ -204,8 +204,6 @@ static int ath_key_config(struct ath_softc *sc,if (!ret)return -EIO ; -if (mac) - sc->sc_keytype = hk.kv_type;return 0 ; }
@@ -1507,7 +1505,6 @@ static int ath9k_set_key(struct ieee80211_hw *hw,case DISABLE_KEY :ath_key_delete (sc, key);clear_bit (key->keyidx, sc->sc_keymap); - sc->sc_keytype =ATH9K_CIPHER_CLR ;break ;default : ret = -EINVAL ;
drivers/net/wireless/ath9k/xmit.c +3 -3
@@ -239,11 +239,11 @@ static int ath_tx_prepare(struct ath_softc *sc, txctl->keyix = tx_info->control.hw_key->hw_key_idx; txctl->frmlen += tx_info->control.icv_len; -if (sc->sc_keytype ==ATH9K_CIPHER_WEP ) +if (tx_info->control.hw_key->alg ==ALG_WEP ) txctl->keytype =ATH9K_KEY_TYPE_WEP ; -else if (sc->sc_keytype ==ATH9K_CIPHER_TKIP ) +else if (tx_info->control.hw_key->alg ==ALG_TKIP ) txctl->keytype =ATH9K_KEY_TYPE_TKIP ; -else if (sc->sc_keytype ==ATH9K_CIPHER_AES_CCM ) +else if (tx_info->control.hw_key->alg ==ALG_CCMP ) txctl->keytype =ATH9K_KEY_TYPE_AES ; }
--
1.5.5
--opJtzjQTFsWo+cga--