Commit 4bf954b2 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: rtw_update_protection23a(): Use cfg80211_find_ie() 



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

drivers/staging/rtl8723au/core/rtw_xmit.c

+8 −9
Original line number Diff line number Diff line
@@ -1322,8 +1322,7 @@ void rtw_update_protection23a(struct rtw_adapter *padapter, u8 *ie, uint ie_len) 
	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

	struct registry_priv *pregistrypriv = &padapter->registrypriv;

	uint protection;

	u8	*perp;

	int	 erp_len;

	const u8 *p;



	switch (pxmitpriv->vcs_setting) {

	case DISABLE_VCS:
@@ -1333,11 +1332,11 @@ void rtw_update_protection23a(struct rtw_adapter *padapter, u8 *ie, uint ie_len) 
		break;

	case AUTO_VCS:

	default:

		perp = rtw_get_ie23a(ie, WLAN_EID_ERP_INFO, &erp_len, ie_len);

		if (perp == NULL) {

		p = cfg80211_find_ie(WLAN_EID_ERP_INFO, ie, ie_len);

		if (!p)

			pxmitpriv->vcs = NONE_VCS;

		} else {

			protection = (*(perp + 2)) & BIT(1);

		else {

			protection = (*(p + 2)) & BIT(1);

			if (protection) {

				if (pregistrypriv->vcs_type == RTS_CTS)

					pxmitpriv->vcs = RTS_CTS;