staging: ks7010: Use constants from ieee80211_eid instead of literal ints.

[ Upstream commit dc13498ab47fdfae3cda4df712beb2e4244b3fe0 ]

The case statement in get_ap_information() should not use literal integers
to parse information element IDs when these values are provided by name
in 'enum ieee80211_eid' in the header 'linux/ieee80211.h'.

Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Reviewed-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index 975dbbb..7da3eb4 100644 (file)
--- a/drivers/staging/ks7010/ks_hostif.c
+++ b/drivers/staging/ks7010/ks_hostif.c
@@ -242,9 +242,8 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
        offset = 0;
 
        while (bsize > offset) {
-               /* DPRINTK(4, "Element ID=%d\n",*bp); */
-               switch (*bp) {
-               case 0: /* ssid */
+               switch (*bp) { /* Information Element ID */
+               case WLAN_EID_SSID:
                        if (*(bp + 1) <= SSID_MAX_SIZE) {
                                ap->ssid.size = *(bp + 1);
                        } else {
@@ -254,8 +253,8 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
                        }
                        memcpy(ap->ssid.body, bp + 2, ap->ssid.size);
                        break;
-               case 1: /* rate */
-               case 50:        /* ext rate */
+               case WLAN_EID_SUPP_RATES:
+               case WLAN_EID_EXT_SUPP_RATES:
                        if ((*(bp + 1) + ap->rate_set.size) <=
                            RATE_SET_MAX_SIZE) {
                                memcpy(&ap->rate_set.body[ap->rate_set.size],
@@ -271,9 +270,9 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
                                    (RATE_SET_MAX_SIZE - ap->rate_set.size);
                        }
                        break;
-               case 3: /* DS parameter */
+               case WLAN_EID_DS_PARAMS:
                        break;
-               case 48:        /* RSN(WPA2) */
+               case WLAN_EID_RSN:
                        ap->rsn_ie.id = *bp;
                        if (*(bp + 1) <= RSN_IE_BODY_MAX) {
                                ap->rsn_ie.size = *(bp + 1);
@@ -284,8 +283,8 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
                        }
                        memcpy(ap->rsn_ie.body, bp + 2, ap->rsn_ie.size);
                        break;
-               case 221:       /* WPA */
-                       if (memcmp(bp + 2, "\x00\x50\xf2\x01", 4) == 0) {       /* WPA OUI check */
+               case WLAN_EID_VENDOR_SPECIFIC: /* WPA */
+                       if (memcmp(bp + 2, "\x00\x50\xf2\x01", 4) == 0) { /* WPA OUI check */
                                ap->wpa_ie.id = *bp;
                                if (*(bp + 1) <= RSN_IE_BODY_MAX) {
                                        ap->wpa_ie.size = *(bp + 1);
@@ -300,18 +299,18 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
                        }
                        break;
 
-               case 2: /* FH parameter */
-               case 4: /* CF parameter */
-               case 5: /* TIM */
-               case 6: /* IBSS parameter */
-               case 7: /* Country */
-               case 42:        /* ERP information */
-               case 47:        /* Reserve ID 47 Broadcom AP */
+               case WLAN_EID_FH_PARAMS:
+               case WLAN_EID_CF_PARAMS:
+               case WLAN_EID_TIM:
+               case WLAN_EID_IBSS_PARAMS:
+               case WLAN_EID_COUNTRY:
+               case WLAN_EID_ERP_INFO:
                        break;
                default:
                        DPRINTK(4, "unknown Element ID=%d\n", *bp);
                        break;
                }
+
                offset += 2;    /* id & size field */
                offset += *(bp + 1);    /* +size offset */
                bp += (*(bp + 1) + 2);  /* pointer update */

diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h
index 5bae8d4..9ac317e 100644 (file)
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -13,6 +13,7 @@
 #define _KS_HOSTIF_H_
 
 #include <linux/compiler.h>
+#include <linux/ieee80211.h>
 
 /*
  * HOST-MAC I/F events