staging: rtl8723au: Get rid of IW_ESSID_MAX_SIZE

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index bed7eb764a51df635a871151ea9cea9a99a4ddb2..59047ad89b31786d7aa5e93344f36d5e831983c9 100644 (file)
--- 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 c2c57c7b233721ae903bcb826505cacad6202791..43f002db937c10b85c6834b0c508cedc9ecdcc21 100644 (file)
--- 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 2fdc2b58312bc4619d8b43da3f7f4ab905ea5d9c..5e0513409214c8bbdd960d552e253ff035f7d09b 100644 (file)
--- 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;
        }