54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Mon, 9 Jun 2014 15:16:35 +0200
|
|
Subject: [056/249] staging: rtl8723au: Get rid of IW_ESSID_MAX_SIZE
|
|
Origin: https://git.kernel.org/linus/7b2e06a159a2398c6b03d38d5e023f98da8c53c6
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 3 ++-
|
|
drivers/staging/rtl8723au/include/ieee80211.h | 2 --
|
|
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 2 +-
|
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
|
|
index bed7eb7..59047ad 100644
|
|
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
|
|
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
|
|
@@ -5945,7 +5945,8 @@ int sitesurvey_cmd_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf)
|
|
for (i = 0; i < RTW_SSID_SCAN_AMOUNT; i++) {
|
|
if (pparm->ssid[i].ssid_len) {
|
|
memcpy(pmlmeext->sitesurvey_res.ssid[i].ssid,
|
|
- pparm->ssid[i].ssid, IW_ESSID_MAX_SIZE);
|
|
+ pparm->ssid[i].ssid,
|
|
+ IEEE80211_MAX_SSID_LEN);
|
|
pmlmeext->sitesurvey_res.ssid[i].ssid_len =
|
|
pparm->ssid[i].ssid_len;
|
|
} else {
|
|
diff --git a/drivers/staging/rtl8723au/include/ieee80211.h b/drivers/staging/rtl8723au/include/ieee80211.h
|
|
index c2c57c7..43f002d 100644
|
|
--- a/drivers/staging/rtl8723au/include/ieee80211.h
|
|
+++ b/drivers/staging/rtl8723au/include/ieee80211.h
|
|
@@ -309,8 +309,6 @@ struct ieee80211_snap_hdr {
|
|
#define MAX_P2P_IE_LEN 256
|
|
#define MAX_WFD_IE_LEN 128
|
|
|
|
-#define IW_ESSID_MAX_SIZE 32
|
|
-
|
|
/*
|
|
join_res:
|
|
-1: authentication fail
|
|
diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
|
|
index 2fdc2b5..5e05134 100644
|
|
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
|
|
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
|
|
@@ -2020,7 +2020,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
|
|
goto exit;
|
|
}
|
|
|
|
- if (sme->ssid_len > IW_ESSID_MAX_SIZE) {
|
|
+ if (sme->ssid_len > IEEE80211_MAX_SSID_LEN) {
|
|
ret = -E2BIG;
|
|
goto exit;
|
|
}
|