OSDN Git Service

staging: ks7010: Replace SSID_MAX_SIZE with IEEE80211_MAX_SSID_LEN.
authorQuytelda Kahja <quytelda@tamalin.org>
Thu, 1 Mar 2018 05:19:08 +0000 (21:19 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Mar 2018 16:34:47 +0000 (17:34 +0100)
SSID_MAX_SIZE is a constant defined locally in ks_hostif.h, but it should
be replaced with IEEE80211_MAX_SSID_LEN from the kernel's 802.11 header,
of which it is just a copy.

Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Reviewed-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ks7010/ks_hostif.c
drivers/staging/ks7010/ks_hostif.h

index 67cf324..59f7c4e 100644 (file)
@@ -253,12 +253,12 @@ int get_ap_information(struct ks_wlan_private *priv, struct ap_info_t *ap_info,
        while (bsize > offset) {
                switch (*bp) { /* Information Element ID */
                case WLAN_EID_SSID:
-                       if (*(bp + 1) <= SSID_MAX_SIZE) {
+                       if (*(bp + 1) <= IEEE80211_MAX_SSID_LEN) {
                                ap->ssid.size = *(bp + 1);
                        } else {
                                DPRINTK(1, "size over :: ssid size=%d\n",
                                        *(bp + 1));
-                               ap->ssid.size = SSID_MAX_SIZE;
+                               ap->ssid.size = IEEE80211_MAX_SSID_LEN;
                        }
                        memcpy(ap->ssid.body, bp + 2, ap->ssid.size);
                        break;
index 9ac317e..b46aa94 100644 (file)
@@ -225,10 +225,9 @@ struct hostif_start_confirm_t {
        __le16 result_code;
 } __packed;
 
-#define SSID_MAX_SIZE 32
 struct ssid_t {
        u8 size;
-       u8 body[SSID_MAX_SIZE];
+       u8 body[IEEE80211_MAX_SSID_LEN];
        u8 ssid_pad;
 } __packed;