Commit 72cac683 authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: replace rtw_ieee80211_spectrum_mgmt_actioncode 



Replace the unique rtw_ieee80211_mgmt_actioncode enum with the provided
standard ieee80211_spectrum_mgmt_actioncode.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201105034754.12383-7-ross.schm.dev@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+5 −5
Original line number Diff line number Diff line
@@ -1891,11 +1891,11 @@ unsigned int on_action_spct(struct adapter *padapter, union recv_frame *precv_fr 


	action = frame_body[1];

	switch (action) {

	case RTW_WLAN_ACTION_SPCT_MSR_REQ:

	case RTW_WLAN_ACTION_SPCT_MSR_RPRT:

	case RTW_WLAN_ACTION_SPCT_TPC_REQ:

	case RTW_WLAN_ACTION_SPCT_TPC_RPRT:

	case RTW_WLAN_ACTION_SPCT_CHL_SWITCH:

	case WLAN_ACTION_SPCT_MSR_REQ:

	case WLAN_ACTION_SPCT_MSR_RPRT:

	case WLAN_ACTION_SPCT_TPC_REQ:

	case WLAN_ACTION_SPCT_TPC_RPRT:

	case WLAN_ACTION_SPCT_CHL_SWITCH:

		break;

	default:

		break;

drivers/staging/rtl8723bs/include/ieee80211.h

+0 −10
Original line number Diff line number Diff line
@@ -893,16 +893,6 @@ enum rtw_ieee80211_category { 
	RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */

};



/* SPECTRUM_MGMT action code */

enum rtw_ieee80211_spectrum_mgmt_actioncode {

	RTW_WLAN_ACTION_SPCT_MSR_REQ = 0,

	RTW_WLAN_ACTION_SPCT_MSR_RPRT = 1,

	RTW_WLAN_ACTION_SPCT_TPC_REQ = 2,

	RTW_WLAN_ACTION_SPCT_TPC_RPRT = 3,

	RTW_WLAN_ACTION_SPCT_CHL_SWITCH = 4,

	RTW_WLAN_ACTION_SPCT_EXT_CHL_SWITCH = 5,

};



enum _PUBLIC_ACTION {

	ACT_PUBLIC_BSSCOEXIST = 0, /*  20/40 BSS Coexistence */

	ACT_PUBLIC_DSE_ENABLE = 1,