diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-08-10 03:46:38 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 16:45:11 -0400 |
commit | 97359d1235eaf634fe706c9faa6e40181cc95fb8 (patch) | |
tree | 5799455c94622eaa6a4fb065bd3b5c350bb705e0 /drivers/net/wireless/p54/main.c | |
parent | 915a824e30c503157c38115eb6a85f60bb653738 (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/p54/main.c')
-rw-r--r-- | drivers/net/wireless/p54/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c index 47db439b63bf..622d27b6d8f2 100644 --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c | |||
@@ -429,8 +429,8 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, | |||
429 | 429 | ||
430 | mutex_lock(&priv->conf_mutex); | 430 | mutex_lock(&priv->conf_mutex); |
431 | if (cmd == SET_KEY) { | 431 | if (cmd == SET_KEY) { |
432 | switch (key->alg) { | 432 | switch (key->cipher) { |
433 | case ALG_TKIP: | 433 | case WLAN_CIPHER_SUITE_TKIP: |
434 | if (!(priv->privacy_caps & (BR_DESC_PRIV_CAP_MICHAEL | | 434 | if (!(priv->privacy_caps & (BR_DESC_PRIV_CAP_MICHAEL | |
435 | BR_DESC_PRIV_CAP_TKIP))) { | 435 | BR_DESC_PRIV_CAP_TKIP))) { |
436 | ret = -EOPNOTSUPP; | 436 | ret = -EOPNOTSUPP; |
@@ -439,7 +439,8 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, | |||
439 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; | 439 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; |
440 | algo = P54_CRYPTO_TKIPMICHAEL; | 440 | algo = P54_CRYPTO_TKIPMICHAEL; |
441 | break; | 441 | break; |
442 | case ALG_WEP: | 442 | case WLAN_CIPHER_SUITE_WEP40: |
443 | case WLAN_CIPHER_SUITE_WEP104: | ||
443 | if (!(priv->privacy_caps & BR_DESC_PRIV_CAP_WEP)) { | 444 | if (!(priv->privacy_caps & BR_DESC_PRIV_CAP_WEP)) { |
444 | ret = -EOPNOTSUPP; | 445 | ret = -EOPNOTSUPP; |
445 | goto out_unlock; | 446 | goto out_unlock; |
@@ -447,7 +448,7 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, | |||
447 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; | 448 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; |
448 | algo = P54_CRYPTO_WEP; | 449 | algo = P54_CRYPTO_WEP; |
449 | break; | 450 | break; |
450 | case ALG_CCMP: | 451 | case WLAN_CIPHER_SUITE_CCMP: |
451 | if (!(priv->privacy_caps & BR_DESC_PRIV_CAP_AESCCMP)) { | 452 | if (!(priv->privacy_caps & BR_DESC_PRIV_CAP_AESCCMP)) { |
452 | ret = -EOPNOTSUPP; | 453 | ret = -EOPNOTSUPP; |
453 | goto out_unlock; | 454 | goto out_unlock; |