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>

1 files changed, 4 insertions, 4 deletions

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;
 
         /*