Commit 129d140d authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use standard mechanisms for qos data frames 



Use defines and macros from ieee80211.h to check for qos data frames and
to mark a frame as qos data.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220327180944.712545-6-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent baa1bb80

drivers/staging/r8188eu/core/rtw_recv.c

+2 −2
Original line number Diff line number Diff line
@@ -749,6 +749,7 @@ static int sta2ap_data_frame(struct adapter *adapter, 
	struct	sta_priv *pstapriv = &adapter->stapriv;

	struct	mlme_priv *pmlmepriv = &adapter->mlmepriv;

	u8 *ptr = precv_frame->rx_data;

	__le16 fc = *(__le16 *)ptr;

	unsigned char *mybssid  = get_bssid(pmlmepriv);

	int ret = _SUCCESS;
@@ -769,9 +770,8 @@ static int sta2ap_data_frame(struct adapter *adapter, 


		process_pwrbit_data(adapter, precv_frame);



		if ((GetFrameSubType(ptr) & WIFI_QOS_DATA_TYPE) == WIFI_QOS_DATA_TYPE) {

		if (ieee80211_is_data_qos(fc))

			process_wmmps_data(adapter, precv_frame);

		}



		if (GetFrameSubType(ptr) & BIT(6)) {

			/* No data, will not indicate to upper layer, temporily count it here */

drivers/staging/r8188eu/core/rtw_xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) 


	pattrib->priority = user_prio;

	pattrib->hdrlen = WLAN_HDR_A3_QOS_LEN;

	pattrib->subtype = WIFI_QOS_DATA_TYPE;

	pattrib->subtype = IEEE80211_STYPE_QOS_DATA | IEEE80211_FTYPE_DATA;

}



static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib)

drivers/staging/r8188eu/include/wifi.h

+1 −5
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
#define WLAN_HDR_A3_QOS_LEN	26

#define WLAN_SSID_MAXLEN	32



enum WIFI_FRAME_TYPE {

	WIFI_QOS_DATA_TYPE	= (BIT(7)|BIT(3)),	/*  QoS Data */

};



enum WIFI_FRAME_SUBTYPE {

	/*  below is for mgt frame */

	WIFI_ASSOCREQ       = (0 | IEEE80211_FTYPE_MGMT),
@@ -48,7 +44,7 @@ enum WIFI_FRAME_SUBTYPE { 
	WIFI_CF_ACK         = (BIT(6) | BIT(4) | IEEE80211_FTYPE_DATA),

	WIFI_CF_POLL        = (BIT(6) | BIT(5) | IEEE80211_FTYPE_DATA),

	WIFI_CF_ACKPOLL     = (BIT(6) | BIT(5) | BIT(4) | IEEE80211_FTYPE_DATA),

	WIFI_QOS_DATA_NULL	= (BIT(6) | WIFI_QOS_DATA_TYPE),

	WIFI_QOS_DATA_NULL	= (BIT(6) | IEEE80211_STYPE_QOS_DATA | IEEE80211_FTYPE_DATA),

};



enum WIFI_REASON_CODE	{