diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-22 15:29:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-22 15:29:05 -0700 |
| commit | 4c07ab0fe4b4eaa0fc31f640ca65da7c173f5043 (patch) | |
| tree | f1e0e7d58fa14b03f0977d0ad02a3a16968474a2 /drivers/net/wireless/ath9k/xmit.c | |
| parent | cec5eb7be3a104fffd27ca967ee8e15a123050e2 (diff) | |
| parent | 6115e8557a75b5f24b56ed46c60dffef7e7fa992 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath9k/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath9k/xmit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index 550129f717e2..8b332e11a656 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c @@ -315,11 +315,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; } |