Commit 39dbc446 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Fold rtw_set_802_11_authentication_mode23a() into cfg80211_rtw_connect() 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c0e0636

drivers/staging/rtl8723au/core/rtw_ioctl_set.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -343,30 +343,6 @@ int rtw_set_802_11_bssid23a_list_scan(struct rtw_adapter *padapter, 
	return res;

	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 -

* rtw_get_cur_max_rate23a -

* @adapter: pointer to _adapter structure

* @adapter: pointer to _adapter structure

drivers/staging/rtl8723au/include/rtw_ioctl_set.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -17,8 +17,6 @@ 




#include <drv_types.h>

#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,

int rtw_set_802_11_bssid23a_list_scan(struct rtw_adapter *padapter,

				      struct cfg80211_ssid *pssid,

				      struct cfg80211_ssid *pssid,

				      int ssid_max_num);

				      int ssid_max_num);

drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -1987,7 +1987,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, 
	int ret = 0;

	int ret = 0;

	struct list_head *phead, *plist, *ptmp;

	struct list_head *phead, *plist, *ptmp;

	struct wlan_network *pnetwork = NULL;

	struct wlan_network *pnetwork = NULL;

	enum ndis_802_11_auth_mode authmode;

	struct cfg80211_ssid ndis_ssid;

	struct cfg80211_ssid ndis_ssid;

	u8 *dst_ssid;

	u8 *dst_ssid;

	u8 *src_ssid;

	u8 *src_ssid;
@@ -2198,8 +2197,13 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, 
			goto exit;

			goto exit;

	}

	}





	authmode = psecuritypriv->ndisauthtype;

	if (psecuritypriv->ndisauthtype > 3)

	rtw_set_802_11_authentication_mode23a(padapter, authmode);

		psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;



	if (rtw_set_auth23a(padapter, psecuritypriv) != _SUCCESS) {

		ret = -EBUSY;

		goto exit;

	}





	/* rtw_set_802_11_encryption_mode(padapter,

	/* rtw_set_802_11_encryption_mode(padapter,

	   padapter->securitypriv.ndisencryptstatus); */

	   padapter->securitypriv.ndisencryptstatus); */