staging/rtl8192e: Add lib80211.h to rtllib.h

Add lib80211.h header file to rtllib.h and get it compiling.

Signed-off-by: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 9a31935bf0dbc98487e8f05b036af74d2b0791d3..17097e7ed9f67cff08a7dca96736d5f91f87dfdf 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -42,6 +42,7 @@
 
 #include <linux/netdevice.h>
 #include <linux/if_arp.h> /* ARPHRD_ETHER */
+#include <net/lib80211.h>
 
 #define MAX_PRECMD_CNT 16
 #define MAX_RFDEPENDCMD_CNT 16
@@ -870,69 +871,6 @@ enum _REG_PREAMBLE_MODE {
 #define WLAN_ERP_USE_PROTECTION (1<<1)
 #define WLAN_ERP_BARKER_PREAMBLE (1<<2)
 
-/* Status codes */
-enum rtllib_statuscode {
-       WLAN_STATUS_SUCCESS = 0,
-       WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
-       WLAN_STATUS_CAPS_UNSUPPORTED = 10,
-       WLAN_STATUS_REASSOC_NO_ASSOC = 11,
-       WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
-       WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
-       WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
-       WLAN_STATUS_CHALLENGE_FAIL = 15,
-       WLAN_STATUS_AUTH_TIMEOUT = 16,
-       WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
-       WLAN_STATUS_ASSOC_DENIED_RATES = 18,
-       /* 802.11b */
-       WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
-       WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
-       WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
-       /* 802.11h */
-       WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
-       WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
-       WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
-       /* 802.11g */
-       WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
-       WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
-       /* 802.11i */
-       WLAN_STATUS_INVALID_IE = 40,
-       WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
-       WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
-       WLAN_STATUS_INVALID_AKMP = 43,
-       WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
-       WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
-       WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
-};
-
-/* Reason codes */
-enum rtllib_reasoncode {
-       WLAN_REASON_UNSPECIFIED = 1,
-       WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
-       WLAN_REASON_DEAUTH_LEAVING = 3,
-       WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
-       WLAN_REASON_DISASSOC_AP_BUSY = 5,
-       WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
-       WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
-       WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
-       WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
-       /* 802.11h */
-       WLAN_REASON_DISASSOC_BAD_POWER = 10,
-       WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
-       /* 802.11i */
-       WLAN_REASON_INVALID_IE = 13,
-       WLAN_REASON_MIC_FAILURE = 14,
-       WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
-       WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
-       WLAN_REASON_IE_DIFFERENT = 17,
-       WLAN_REASON_INVALID_GROUP_CIPHER = 18,
-       WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
-       WLAN_REASON_INVALID_AKMP = 20,
-       WLAN_REASON_UNSUPP_RSN_VERSION = 21,
-       WLAN_REASON_INVALID_RSN_IE_CAP = 22,
-       WLAN_REASON_IEEE8021X_FAILED = 23,
-       WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
-};
-
 #define RTLLIB_STATMASK_SIGNAL (1<<0)
 #define RTLLIB_STATMASK_RSSI (1<<1)
 #define RTLLIB_STATMASK_NOISE (1<<2)
@@ -1146,7 +1084,6 @@ struct rtllib_device;
 #define SEC_ALG_TKIP           2
 #define SEC_ALG_CCMP           4
 
-#define WEP_KEYS               4
 #define WEP_KEY_LEN            13
 #define SCM_KEY_LEN            32
 #define SCM_TEMPORAL_KEY_LENGTH 16
@@ -1158,8 +1095,8 @@ struct rtllib_security {
            auth_algo:4,
            unicast_uses_group:1,
            encrypt:1;
-       u8 key_sizes[WEP_KEYS];
-       u8 keys[WEP_KEYS][SCM_KEY_LEN];
+       u8 key_sizes[NUM_WEP_KEYS];
+       u8 keys[NUM_WEP_KEYS][SCM_KEY_LEN];
        u8 level;
        u16 flags;
 } __packed;
@@ -2252,7 +2189,7 @@ struct rtllib_device {
        u16 pairwise_key_type;
        u16 group_key_type;
        struct list_head crypt_deinit_list;
-       struct rtllib_crypt_data *crypt[WEP_KEYS];
+       struct rtllib_crypt_data *crypt[NUM_WEP_KEYS];
 
        int tx_keyidx; /* default TX key index (crypt[tx_keyidx]) */
        struct sw_cam_table swcamtable[TOTAL_CAM_ENTRY];

diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
index c92ad9fe24c74519fb14b6f1f6700efb1454bb37..63d553f5269334038ceaa35e92029444807fd5ab 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_module.c
@@ -199,7 +199,7 @@ void free_rtllib(struct net_device *dev)
        del_timer_sync(&ieee->crypt_deinit_timer);
        rtllib_crypt_deinit_entries(ieee, 1);
 
-       for (i = 0; i < WEP_KEYS; i++) {
+       for (i = 0; i < NUM_WEP_KEYS; i++) {
                struct rtllib_crypt_data *crypt = ieee->crypt[i];
                if (crypt) {
                        if (crypt->ops)

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 44b466b6095296544c1a6b142456b41ae914c367..022bf40122e3c9be5a9ab57345a4455e1fbb6cce 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -3365,7 +3365,7 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
        if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
            param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
            param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
-               if (param->u.crypt.idx >= WEP_KEYS)
+               if (param->u.crypt.idx >= NUM_WEP_KEYS)
                        return -EINVAL;
                crypt = &ieee->crypt[param->u.crypt.idx];
        } else {

diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 5e81734fbe91c510b2f10a3ead297e91509215b8..48afd4cb51707fbcb9f48ba519de20cc1597465b 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -312,7 +312,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
 
        key = erq->flags & IW_ENCODE_INDEX;
        if (key) {
-               if (key > WEP_KEYS)
+               if (key > NUM_WEP_KEYS)
                        return -EINVAL;
                key--;
                key_provided = 1;
@@ -334,7 +334,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
 
                /* Check all the keys to see if any are still configured,
                 * and if no key index was provided, de-init them all */
-               for (i = 0; i < WEP_KEYS; i++) {
+               for (i = 0; i < NUM_WEP_KEYS; i++) {
                        if (ieee->crypt[i] != NULL) {
                                if (key_provided)
                                        break;
@@ -343,7 +343,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
                        }
                }
 
-               if (i == WEP_KEYS) {
+               if (i == NUM_WEP_KEYS) {
                        sec.enabled = 0;
                        sec.level = SEC_LEVEL_0;
                        sec.flags |= SEC_ENABLED | SEC_LEVEL;
@@ -486,7 +486,7 @@ int rtllib_wx_get_encode(struct rtllib_device *ieee,
 
        key = erq->flags & IW_ENCODE_INDEX;
        if (key) {
-               if (key > WEP_KEYS)
+               if (key > NUM_WEP_KEYS)
                        return -EINVAL;
                key--;
        } else {
@@ -534,7 +534,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
        };
        idx = encoding->flags & IW_ENCODE_INDEX;
        if (idx) {
-               if (idx < 1 || idx > WEP_KEYS)
+               if (idx < 1 || idx > NUM_WEP_KEYS)
                        return -EINVAL;
                idx--;
        } else{
@@ -559,11 +559,11 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
                if (*crypt)
                        rtllib_crypt_delayed_deinit(ieee, crypt);
 
-               for (i = 0; i < WEP_KEYS; i++) {
+               for (i = 0; i < NUM_WEP_KEYS; i++) {
                        if (ieee->crypt[i] != NULL)
                                break;
                }
-               if (i == WEP_KEYS) {
+               if (i == NUM_WEP_KEYS) {
                        sec.enabled = 0;
                        sec.level = SEC_LEVEL_0;
                        sec.flags |= SEC_LEVEL;
@@ -692,7 +692,7 @@ int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
 
        idx = encoding->flags & IW_ENCODE_INDEX;
        if (idx) {
-               if (idx < 1 || idx > WEP_KEYS)
+               if (idx < 1 || idx > NUM_WEP_KEYS)
                        return -EINVAL;
                idx--;
        } else {