staging: rtl8723au: rtw_report_sec_ie23a() is only called from rtw_mlme.c

Move it there and declare it static

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.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 4846768809c10502b7cf74e6cd324a250170fc3c..1060a9fab64fa8b6710d9f2f32f98c709bcf719a 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -2002,6 +2002,48 @@ static int rtw_append_pmkid(struct rtw_adapter *Adapter, int iEntry,
        }
        return ie_len;
 }
+
+static void
+_rtw_report_sec_ie(struct rtw_adapter *adapter, u8 authmode, u8 *sec_ie)
+{
+       uint    len;
+       u8      *buff, *p, i;
+       union iwreq_data wrqu;
+
+       RT_TRACE(_module_mlme_osdep_c_, _drv_info_,
+                ("+_rtw_report_sec_ie, authmode =%d\n", authmode));
+
+       buff = NULL;
+       if (authmode == _WPA_IE_ID_) {
+               RT_TRACE(_module_mlme_osdep_c_, _drv_info_,
+                        ("_rtw_report_sec_ie, authmode =%d\n", authmode));
+
+               buff = kzalloc(IW_CUSTOM_MAX, GFP_KERNEL);
+               if (!buff)
+                       return;
+               p = buff;
+
+               p += sprintf(p, "ASSOCINFO(ReqIEs =");
+
+               len = sec_ie[1]+2;
+               len =  (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX;
+
+               for (i = 0; i < len; i++)
+                       p += sprintf(p, "%02x", sec_ie[i]);
+
+               p += sprintf(p, ")");
+
+               memset(&wrqu, 0, sizeof(wrqu));
+
+               wrqu.data.length = p-buff;
+
+               wrqu.data.length = (wrqu.data.length < IW_CUSTOM_MAX) ?
+                                  wrqu.data.length : IW_CUSTOM_MAX;
+
+               kfree(buff);
+       }
+}
+
 int rtw_restruct_sec_ie23a(struct rtw_adapter *adapter, u8 *in_ie, u8 *out_ie,
                        uint in_len)
 {
@@ -2037,8 +2079,8 @@ int rtw_restruct_sec_ie23a(struct rtw_adapter *adapter, u8 *in_ie, u8 *out_ie,
                memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0],
                       psecuritypriv->supplicant_ie[1] + 2);
                ielength += psecuritypriv->supplicant_ie[1] + 2;
-               rtw_report_sec_ie23a(adapter, authmode,
-                                 psecuritypriv->supplicant_ie);
+               _rtw_report_sec_ie(adapter, authmode,
+                                  psecuritypriv->supplicant_ie);
        }
 
        iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);

diff --git a/drivers/staging/rtl8723au/include/mlme_osdep.h b/drivers/staging/rtl8723au/include/mlme_osdep.h
index e2cae3d635272cff1eb2cfc114fd681da2d654d0..4bb5525b7a6823c4237ea49b506ef8b078614c24 100644 (file)
--- a/drivers/staging/rtl8723au/include/mlme_osdep.h
+++ b/drivers/staging/rtl8723au/include/mlme_osdep.h
@@ -19,8 +19,6 @@
 #include <drv_types.h>
 
 void rtw_os_indicate_disconnect23a(struct rtw_adapter *adapter);
-void rtw_report_sec_ie23a(struct rtw_adapter *adapter, u8 authmode, u8 *sec_ie);
-
 void rtw_reset_securitypriv23a(struct rtw_adapter *adapter);
 
 #endif /* _MLME_OSDEP_H_ */

diff --git a/drivers/staging/rtl8723au/os_dep/mlme_linux.c b/drivers/staging/rtl8723au/os_dep/mlme_linux.c
index 959c1d1d838a36c21bf5278f408686af5e5edea8..c0e79f56d2eb80be6f89fc820f4f7c8ad5fe76bd 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723au/os_dep/mlme_linux.c
@@ -80,43 +80,3 @@ void rtw_os_indicate_disconnect23a(struct rtw_adapter *adapter)
 
        rtw_reset_securitypriv23a(adapter);
 }
-
-void rtw_report_sec_ie23a(struct rtw_adapter *adapter, u8 authmode, u8 *sec_ie)
-{
-       uint    len;
-       u8      *buff, *p, i;
-       union iwreq_data wrqu;
-
-       RT_TRACE(_module_mlme_osdep_c_, _drv_info_,
-                ("+rtw_report_sec_ie23a, authmode =%d\n", authmode));
-
-       buff = NULL;
-       if (authmode == _WPA_IE_ID_) {
-               RT_TRACE(_module_mlme_osdep_c_, _drv_info_,
-                        ("rtw_report_sec_ie23a, authmode =%d\n", authmode));
-
-               buff = kzalloc(IW_CUSTOM_MAX, GFP_KERNEL);
-               if (!buff)
-                       return;
-               p = buff;
-
-               p += sprintf(p, "ASSOCINFO(ReqIEs =");
-
-               len = sec_ie[1]+2;
-               len =  (len < IW_CUSTOM_MAX) ? len : IW_CUSTOM_MAX;
-
-               for (i = 0; i < len; i++)
-                       p += sprintf(p, "%02x", sec_ie[i]);
-
-               p += sprintf(p, ")");
-
-               memset(&wrqu, 0, sizeof(wrqu));
-
-               wrqu.data.length = p-buff;
-
-               wrqu.data.length = (wrqu.data.length < IW_CUSTOM_MAX) ?
-                                  wrqu.data.length : IW_CUSTOM_MAX;
-
-               kfree(buff);
-       }
-}