wireless: move some utility functions from mac80211 to cfg80211

The patch moves some utility functions from mac80211 to cfg80211.
Because these functions are doing generic 802.11 operations so they
are not mac80211 specific. The moving allows some fullmac drivers
to be also benefit from these utility functions.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

5 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index 4ef1d2fc859c..99df9ddae9cb 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -1555,7 +1555,7 @@ static int ar9170_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         switch (key->alg) {
         case ALG_WEP:
-                if (key->keylen == LEN_WEP40)
+                if (key->keylen == WLAN_KEY_LEN_WEP40)
                         ktype = AR9170_ENC_ALG_WEP64;
                 else
                         ktype = AR9170_ENC_ALG_WEP128;
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
index 579aa0a96ab8..ec35503f6a40 100644
--- a/drivers/net/wireless/ath/ath5k/pcu.c
+++ b/drivers/net/wireless/ath/ath5k/pcu.c
@@ -1038,9 +1038,9 @@ int ath5k_keycache_type(const struct ieee80211_key_conf *key)
         case ALG_CCMP:
                 return AR5K_KEYTABLE_TYPE_CCM;
         case ALG_WEP:
-                if (key->keylen == LEN_WEP40)
+                if (key->keylen == WLAN_KEY_LEN_WEP40)
                         return AR5K_KEYTABLE_TYPE_40;
-                else if (key->keylen == LEN_WEP104)
+                else if (key->keylen == WLAN_KEY_LEN_WEP104)
                         return AR5K_KEYTABLE_TYPE_104;
                 return -EINVAL;
         default:
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 4acfab514916..1579c9407ed5 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2472,14 +2472,14 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
                 }
                 break;
         case ATH9K_CIPHER_WEP:
-                if (k->kv_len < LEN_WEP40) {
+                if (k->kv_len < WLAN_KEY_LEN_WEP40) {
                         DPRINTF(ah->ah_sc, ATH_DBG_ANY,
                                 "WEP key length %u too small\n", k->kv_len);
                         return false;
                 }
-                if (k->kv_len <= LEN_WEP40)
+                if (k->kv_len <= WLAN_KEY_LEN_WEP40)
                         keyType = AR_KEYTABLE_TYPE_40;
-                else if (k->kv_len <= LEN_WEP104)
+                else if (k->kv_len <= WLAN_KEY_LEN_WEP104)
                         keyType = AR_KEYTABLE_TYPE_104;
                 else
                         keyType = AR_KEYTABLE_TYPE_128;
@@ -2498,7 +2498,7 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
         key2 = get_unaligned_le32(k->kv_val + 6);
         key3 = get_unaligned_le16(k->kv_val + 10);
         key4 = get_unaligned_le32(k->kv_val + 12);
-        if (k->kv_len <= LEN_WEP104)
+        if (k->kv_len <= WLAN_KEY_LEN_WEP104)
                 key4 &= 0xff;
 
         /*
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index ec8516eadc4f..cb4a8712946a 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3637,7 +3637,7 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         err = -EINVAL;
         switch (key->alg) {
         case ALG_WEP:
-                if (key->keylen == LEN_WEP40)
+                if (key->keylen == WLAN_KEY_LEN_WEP40)
                         algorithm = B43_SEC_ALGO_WEP40;
                 else
                         algorithm = B43_SEC_ALGO_WEP104;
diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/rt2x00/rt2x00crypto.c
index 57ab42cfed34..bc4e81e21841 100644
--- a/drivers/net/wireless/rt2x00/rt2x00crypto.c
+++ b/drivers/net/wireless/rt2x00/rt2x00crypto.c
@@ -33,7 +33,7 @@ enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key)
 {
         switch (key->alg) {
         case ALG_WEP:
-                if (key->keylen == LEN_WEP40)
+                if (key->keylen == WLAN_KEY_LEN_WEP40)
                         return CIPHER_WEP64;
                 else
                         return CIPHER_WEP128;