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

staging: r8188eu: use ieee80211 define for management frame type 



Replace the driver-internal define for management frame type with
IEEE80211_FTYPE_MGMT.

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


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ 




#define _RTW_MLME_EXT_C_

#define _RTW_MLME_EXT_C_





#include <linux/ieee80211.h>

#include "../include/osdep_service.h"

#include "../include/osdep_service.h"

#include "../include/drv_types.h"

#include "../include/drv_types.h"

#include "../include/wifi.h"

#include "../include/wifi.h"
@@ -414,7 +415,7 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame) 
	u8 *pframe = precv_frame->rx_data;

	u8 *pframe = precv_frame->rx_data;

	struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(pframe));

	struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(pframe));





	if (GetFrameType(pframe) != WIFI_MGT_TYPE)

	if (GetFrameType(pframe) != IEEE80211_FTYPE_MGMT)

		return;

		return;





	/* receive the frames that ra(a1) is my address or ra(a1) is bc address. */

	/* receive the frames that ra(a1) is my address or ra(a1) is bc address. */

drivers/staging/r8188eu/core/rtw_recv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1094,7 +1094,7 @@ static int validate_recv_frame(struct adapter *adapter, struct recv_frame *precv 
	/* Dump rx packets */

	/* Dump rx packets */

	GetHalDefVar8188EUsb(adapter, HAL_DEF_DBG_DUMP_RXPKT, &bDumpRxPkt);

	GetHalDefVar8188EUsb(adapter, HAL_DEF_DBG_DUMP_RXPKT, &bDumpRxPkt);

	switch (type) {

	switch (type) {

	case WIFI_MGT_TYPE: /* mgnt */

	case IEEE80211_FTYPE_MGMT:

		validate_recv_mgnt_frame(adapter, precv_frame);

		validate_recv_mgnt_frame(adapter, precv_frame);

		retval = _FAIL; /*  only data frame return _SUCCESS */

		retval = _FAIL; /*  only data frame return _SUCCESS */

		break;

		break;

drivers/staging/r8188eu/include/wifi.h

+12 −13
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define WLAN_SSID_MAXLEN	32

#define WLAN_SSID_MAXLEN	32





enum WIFI_FRAME_TYPE {

enum WIFI_FRAME_TYPE {

	WIFI_MGT_TYPE  =	(0),

	WIFI_CTRL_TYPE =	(BIT(2)),

	WIFI_CTRL_TYPE =	(BIT(2)),

	WIFI_DATA_TYPE =	(BIT(3)),

	WIFI_DATA_TYPE =	(BIT(3)),

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

	WIFI_QOS_DATA_TYPE	= (BIT(7)|BIT(3)),	/*  QoS Data */
@@ -26,18 +25,18 @@ enum WIFI_FRAME_TYPE { 




enum WIFI_FRAME_SUBTYPE {

enum WIFI_FRAME_SUBTYPE {

	/*  below is for mgt frame */

	/*  below is for mgt frame */

	WIFI_ASSOCREQ       = (0 | WIFI_MGT_TYPE),

	WIFI_ASSOCREQ       = (0 | IEEE80211_FTYPE_MGMT),

	WIFI_ASSOCRSP       = (BIT(4) | WIFI_MGT_TYPE),

	WIFI_ASSOCRSP       = (BIT(4) | IEEE80211_FTYPE_MGMT),

	WIFI_REASSOCREQ     = (BIT(5) | WIFI_MGT_TYPE),

	WIFI_REASSOCREQ     = (BIT(5) | IEEE80211_FTYPE_MGMT),

	WIFI_REASSOCRSP     = (BIT(5) | BIT(4) | WIFI_MGT_TYPE),

	WIFI_REASSOCRSP     = (BIT(5) | BIT(4) | IEEE80211_FTYPE_MGMT),

	WIFI_PROBEREQ       = (BIT(6) | WIFI_MGT_TYPE),

	WIFI_PROBEREQ       = (BIT(6) | IEEE80211_FTYPE_MGMT),

	WIFI_PROBERSP       = (BIT(6) | BIT(4) | WIFI_MGT_TYPE),

	WIFI_PROBERSP       = (BIT(6) | BIT(4) | IEEE80211_FTYPE_MGMT),

	WIFI_BEACON         = (BIT(7) | WIFI_MGT_TYPE),

	WIFI_BEACON         = (BIT(7) | IEEE80211_FTYPE_MGMT),

	WIFI_ATIM           = (BIT(7) | BIT(4) | WIFI_MGT_TYPE),

	WIFI_ATIM           = (BIT(7) | BIT(4) | IEEE80211_FTYPE_MGMT),

	WIFI_DISASSOC       = (BIT(7) | BIT(5) | WIFI_MGT_TYPE),

	WIFI_DISASSOC       = (BIT(7) | BIT(5) | IEEE80211_FTYPE_MGMT),

	WIFI_AUTH           = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE),

	WIFI_AUTH           = (BIT(7) | BIT(5) | BIT(4) | IEEE80211_FTYPE_MGMT),

	WIFI_DEAUTH         = (BIT(7) | BIT(6) | WIFI_MGT_TYPE),

	WIFI_DEAUTH         = (BIT(7) | BIT(6) | IEEE80211_FTYPE_MGMT),

	WIFI_ACTION         = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE),

	WIFI_ACTION         = (BIT(7) | BIT(6) | BIT(4) | IEEE80211_FTYPE_MGMT),





	/*  below is for control frame */

	/*  below is for control frame */

	WIFI_PSPOLL         = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE),

	WIFI_PSPOLL         = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE),