[PATCH 46/76] staging: rtl8723au: Fold rtw_set_802_11_authentication_mode23a() into cfg80211_rtw_connect()

[Jes . Sorensen]

From: Jes Sorensen <jes.soren...@redhat.com>

Signed-off-by: Jes Sorensen <jes.soren...@redhat.com>
---
 drivers/staging/rtl8723au/core/rtw_ioctl_set.c    | 24 -----------------------
 drivers/staging/rtl8723au/include/rtw_ioctl_set.h |  2 --
 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 10 +++++++---
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_ioctl_set.c 
b/drivers/staging/rtl8723au/core/rtw_ioctl_set.c
index 8d76748..5c3b561 100644
--- a/drivers/staging/rtl8723au/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723au/core/rtw_ioctl_set.c
@@ -343,30 +343,6 @@ exit:
        return res;
 }
 
-int rtw_set_802_11_authentication_mode23a(struct rtw_adapter* padapter,
-                                         enum ndis_802_11_auth_mode authmode)
-{
-       struct security_priv *psecuritypriv = &padapter->securitypriv;
-       int res;
-
-       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
-                ("set_802_11_auth.mode(): mode =%x\n", authmode));
-
-       psecuritypriv->ndisauthtype = authmode;
-
-       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
-                ("rtw_set_802_11_authentication_mode23a:"
-                 "psecuritypriv->ndisauthtype =%d",
-                 psecuritypriv->ndisauthtype));
-
-       if (psecuritypriv->ndisauthtype > 3)
-               psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
-
-       res = rtw_set_auth23a(padapter, psecuritypriv);
-
-       return res;
-}
-
 /*
 * rtw_get_cur_max_rate23a -
 * @adapter: pointer to _adapter structure
diff --git a/drivers/staging/rtl8723au/include/rtw_ioctl_set.h 
b/drivers/staging/rtl8723au/include/rtw_ioctl_set.h
index 040543b..bc5805a 100644
--- a/drivers/staging/rtl8723au/include/rtw_ioctl_set.h
+++ b/drivers/staging/rtl8723au/include/rtw_ioctl_set.h
@@ -17,8 +17,6 @@
 
 #include <drv_types.h>
 
-int rtw_set_802_11_authentication_mode23a(struct rtw_adapter *pdapter,
-                                         enum ndis_802_11_auth_mode authmode);
 int rtw_set_802_11_bssid23a_list_scan(struct rtw_adapter *padapter,
                                      struct cfg80211_ssid *pssid,
                                      int ssid_max_num);
diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index 1168e7c..b3b3fdc 100644
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -1987,7 +1987,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, 
struct net_device *ndev,
        int ret = 0;
        struct list_head *phead, *plist, *ptmp;
        struct wlan_network *pnetwork = NULL;
-       enum ndis_802_11_auth_mode authmode;
        struct cfg80211_ssid ndis_ssid;
        u8 *dst_ssid;
        u8 *src_ssid;
@@ -2198,8 +2197,13 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, 
struct net_device *ndev,
                        goto exit;
        }
 
-       authmode = psecuritypriv->ndisauthtype;
-       rtw_set_802_11_authentication_mode23a(padapter, authmode);
+       if (psecuritypriv->ndisauthtype > 3)
+               psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
+
+       if (rtw_set_auth23a(padapter, psecuritypriv) != _SUCCESS) {
+               ret = -EBUSY;
+               goto exit;
+       }
 
        /* rtw_set_802_11_encryption_mode(padapter,
           padapter->securitypriv.ndisencryptstatus); */
-- 
1.9.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel