Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c3a8f2a authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: OnAssocReq23a(): Use cfg80211_find_vendor_ie() to locate VMM 



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

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+30 −32
Original line number Diff line number Diff line
@@ -1327,7 +1327,6 @@ OnAssocReq23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame) 
	u16 capab_info, listen_interval;

	struct sta_info	*pstat;

	unsigned char reassoc;

	unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01};

	int i, wpa_ie_len, left;

	unsigned char supportRate[16];

	int supportRateNum;
@@ -1577,9 +1576,10 @@ OnAssocReq23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame) 


		for (;;) {

			left = end - p;

			p = cfg80211_find_ie(WLAN_EID_VENDOR_SPECIFIC, p, left);

			p = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,

						    WLAN_OUI_TYPE_MICROSOFT_WMM,

						    p, left);

			if (p) {

				if (!memcmp(p + 2, WMM_IE, 6)) {

				pstat->flags |= WLAN_STA_WME;



				pstat->qos_option = 1;
@@ -1615,9 +1615,7 @@ OnAssocReq23a(struct rtw_adapter *padapter, struct recv_frame *precv_frame) 
						pstat->uapsd_be = 0;



				}



				break;

				}

			} else {

				break;

			}