diff options
| author |   Quytelda Kahja <quytelda@tamalin.org> | 2018-02-28 21:19:08 -0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-01 17:34:47 +0100 |
| commit | 15b6d73eaa7c35f52feb797e3e35a6477b41a624 (patch) | |
| tree | 5f3ab754eff4c3a82be8c4bb324eead318bb11ff | |
| parent | staging: ks7010: Use constants from ieee80211_eid instead of literal ints. (diff) | |
| download | linux-dev-15b6d73eaa7c35f52feb797e3e35a6477b41a624.tar.xz linux-dev-15b6d73eaa7c35f52feb797e3e35a6477b41a624.zip | |
staging: ks7010: Replace SSID_MAX_SIZE with IEEE80211_MAX_SSID_LEN.
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>
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.c | 4 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 67cf32433023..59f7c4e422d3 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -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; diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h index 9ac317e4b507..b46aa94c0d48 100644 --- a/drivers/staging/ks7010/ks_hostif.h +++ b/drivers/staging/ks7010/ks_hostif.h @@ -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; |