Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: r8188eu: replace enum rtw_ieee80211_spectrum_mgmt_actioncode with ieee80211_spectrum_mgmt_actioncode

Enum rtw_ieee80211_spectrum_mgmt_actioncode is a duplication
of ieee80211_spectrum_mgmt_actioncode from include/linux/ieee80211.h.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20200906133236.556427-1-insafonov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ivan Safonov and committed by
Greg Kroah-Hartman
9dc0e03d e2664d08

+5 -15
+5 -5
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
··· 3546 3546 3547 3547 action = frame_body[1]; 3548 3548 switch (action) { 3549 - case RTW_WLAN_ACTION_SPCT_MSR_REQ: 3550 - case RTW_WLAN_ACTION_SPCT_MSR_RPRT: 3551 - case RTW_WLAN_ACTION_SPCT_TPC_REQ: 3552 - case RTW_WLAN_ACTION_SPCT_TPC_RPRT: 3549 + case WLAN_ACTION_SPCT_MSR_REQ: 3550 + case WLAN_ACTION_SPCT_MSR_RPRT: 3551 + case WLAN_ACTION_SPCT_TPC_REQ: 3552 + case WLAN_ACTION_SPCT_TPC_RPRT: 3553 3553 break; 3554 - case RTW_WLAN_ACTION_SPCT_CHL_SWITCH: 3554 + case WLAN_ACTION_SPCT_CHL_SWITCH: 3555 3555 break; 3556 3556 default: 3557 3557 break;
-10
drivers/staging/rtl8188eu/include/ieee80211.h
··· 526 526 RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */ 527 527 }; 528 528 529 - /* SPECTRUM_MGMT action code */ 530 - enum rtw_ieee80211_spectrum_mgmt_actioncode { 531 - RTW_WLAN_ACTION_SPCT_MSR_REQ = 0, 532 - RTW_WLAN_ACTION_SPCT_MSR_RPRT = 1, 533 - RTW_WLAN_ACTION_SPCT_TPC_REQ = 2, 534 - RTW_WLAN_ACTION_SPCT_TPC_RPRT = 3, 535 - RTW_WLAN_ACTION_SPCT_CHL_SWITCH = 4, 536 - RTW_WLAN_ACTION_SPCT_EXT_CHL_SWITCH = 5, 537 - }; 538 - 539 529 enum _PUBLIC_ACTION { 540 530 ACT_PUBLIC_BSSCOEXIST = 0, /* 20/40 BSS Coexistence */ 541 531 ACT_PUBLIC_DSE_ENABLE = 1,