mac80211: use cipher suite selectors
Currently, mac80211 translates the cfg80211 cipher suite selectors into ALG_* values. That isn't all too useful, and some drivers benefit from the distinction between WEP40 and WEP104 as well. Therefore, convert it all to use the cipher suite selectors. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
915a824e30
commit
97359d1235
@@ -2061,11 +2061,12 @@ static int at76_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
|
||||
|
||||
int i;
|
||||
|
||||
at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d "
|
||||
at76_dbg(DBG_MAC80211, "%s(): cmd %d key->cipher %d key->keyidx %d "
|
||||
"key->keylen %d",
|
||||
__func__, cmd, key->alg, key->keyidx, key->keylen);
|
||||
__func__, cmd, key->cipher, key->keyidx, key->keylen);
|
||||
|
||||
if (key->alg != ALG_WEP)
|
||||
if ((key->cipher != WLAN_CIPHER_SUITE_WEP40) &&
|
||||
(key->cipher != WLAN_CIPHER_SUITE_WEP104))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
key->hw_key_idx = key->keyidx;
|
||||
|
Reference in New Issue
Block a user