From: Marco Cesati <marcocesati@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans de Goede <hdegoede@redhat.com>,
Larry Finger <Larry.Finger@lwfinger.net>,
linux-staging@lists.linux.dev
Subject: [PATCH 24/33] Staging: rtl8723bs: remove named enums in ieee80211.h
Date: Wed, 24 Mar 2021 13:44:47 +0100 [thread overview]
Message-ID: <20210324124456.25221-25-marcocesati@gmail.com> (raw)
In-Reply-To: <20210324124456.25221-1-marcocesati@gmail.com>
Remove the following unnecessary enum names or definitions in
include/ieee80211.h:
enum rateid_idx [name]
enum ratr_table_mode [definition]
enum eap_type [definition]
enum mgn_rate [name]
enum ieee80211_state [definition]
enum rtw_ieee80211_category [name]
enum _public_action [name]
enum rtw_ieee80211_back_parties [definition]
enum rtw_ieee80211_vht_actioncode [definition]
enum secondary_ch_offset [definition]
Signed-off-by: Marco Cesati <marcocesati@gmail.com>
---
drivers/staging/rtl8723bs/include/ieee80211.h | 89 +------------------
1 file changed, 4 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index 8a10bca876b8..6540c7a22938 100644
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -125,7 +125,7 @@ extern u8 RSN_CIPHER_SUITE_CCMP[];
extern u8 RSN_CIPHER_SUITE_WEP104[];
-enum rateid_idx {
+enum {
RATEID_IDX_BGN_40M_2SS = 0,
RATEID_IDX_BGN_40M_1SS = 1,
RATEID_IDX_BGN_20M_2SS_BN = 2,
@@ -139,19 +139,6 @@ enum rateid_idx {
RATEID_IDX_VHT_1SS = 10,
};
-enum ratr_table_mode {
- RATR_INX_WIRELESS_NGB = 0, /* BGN 40 Mhz 2SS 1SS */
- RATR_INX_WIRELESS_NG = 1, /* GN or N */
- RATR_INX_WIRELESS_NB = 2, /* BGN 20 Mhz 2SS 1SS or BN */
- RATR_INX_WIRELESS_N = 3,
- RATR_INX_WIRELESS_GB = 4,
- RATR_INX_WIRELESS_G = 5,
- RATR_INX_WIRELESS_B = 6,
- RATR_INX_WIRELESS_MC = 7,
- RATR_INX_WIRELESS_AC_N = 8,
-};
-
-
enum network_type {
WIRELESS_INVALID = 0,
/* Sub-Element */
@@ -274,14 +261,6 @@ struct eapol {
u16 length;
} __attribute__ ((packed));
-enum eap_type {
- EAP_PACKET = 0,
- EAPOL_START,
- EAPOL_LOGOFF,
- EAPOL_KEY,
- EAPOL_ENCAP_ASF_ALERT
-};
-
#define IEEE80211_FCS_LEN 4
#define MIN_FRAG_THRESHOLD 256U
@@ -415,7 +394,7 @@ struct ieee80211_snap_hdr {
#define IEEE80211_OFDM_SHIFT_MASK_A 4
-enum mgn_rate {
+enum {
MGN_1M = 0x02,
MGN_2M = 0x04,
MGN_5_5M = 0x0B,
@@ -615,45 +594,6 @@ Total: 28-2340 bytes
> 0: TID
*/
-enum ieee80211_state {
-
- /* the card is not linked at all */
- IEEE80211_NOLINK = 0,
-
- /* IEEE80211_ASSOCIATING* are for BSS client mode
- * the driver shall not perform RX filtering unless
- * the state is LINKED.
- * The driver shall just check for the state LINKED and
- * defaults to NOLINK for ALL the other states (including
- * LINKED_SCANNING)
- */
-
- /* the association procedure will start (wq scheduling)*/
- IEEE80211_ASSOCIATING,
- IEEE80211_ASSOCIATING_RETRY,
-
- /* the association procedure is sending AUTH request*/
- IEEE80211_ASSOCIATING_AUTHENTICATING,
-
- /* the association procedure has successfully authentcated
- * and is sending association request
- */
- IEEE80211_ASSOCIATING_AUTHENTICATED,
-
- /* the link is ok. the card associated to a BSS or linked
- * to a ibss cell or acting as an AP and creating the bss
- */
- IEEE80211_LINKED,
-
- /* same as LINKED, but the driver shall apply RX filter
- * rules as we are in NO_LINK mode. As the card is still
- * logically linked, but it is doing a syncro site survey
- * then it will be back to LINKED state.
- */
- IEEE80211_LINKED_SCANNING,
-
-};
-
#define DEFAULT_MAX_SCAN_AGE (15 * HZ)
#define DEFAULT_FTS 2346
#define MAC_ARG(x) (x)
@@ -687,7 +627,7 @@ static inline int is_zero_mac_addr(const u8 *addr)
#define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G)
/* Action category code */
-enum rtw_ieee80211_category {
+enum {
RTW_WLAN_CATEGORY_SPECTRUM_MGMT = 0,
RTW_WLAN_CATEGORY_QOS = 1,
RTW_WLAN_CATEGORY_DLS = 2,
@@ -705,7 +645,7 @@ enum rtw_ieee80211_category {
RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */
};
-enum _public_action {
+enum {
ACT_PUBLIC_BSSCOEXIST = 0, /* 20/40 BSS Coexistence */
ACT_PUBLIC_DSE_ENABLE = 1,
ACT_PUBLIC_DSE_DEENABLE = 2,
@@ -725,21 +665,6 @@ enum _public_action {
ACT_PUBLIC_MAX
};
-/* BACK (block-ack) parties */
-enum rtw_ieee80211_back_parties {
- RTW_WLAN_BACK_RECIPIENT = 0,
- RTW_WLAN_BACK_INITIATOR = 1,
- RTW_WLAN_BACK_TIMER = 2,
-};
-
-/* VHT features action code */
-enum rtw_ieee80211_vht_actioncode {
- RTW_WLAN_ACTION_VHT_COMPRESSED_BEAMFORMING = 0,
- RTW_WLAN_ACTION_VHT_GROUPID_MANAGEMENT = 1,
- RTW_WLAN_ACTION_VHT_OPMODE_NOTIFICATION = 2,
-};
-
-
#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
* 00:50:F2 */
#define WME_OUI_TYPE 2
@@ -898,12 +823,6 @@ enum ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *source, unsigned int *frlen);
u8 *rtw_set_ie(u8 *pbuf, signed int index, uint len, u8 *source, uint *frlen);
-enum secondary_ch_offset {
- SCN = 0, /* no secondary channel */
- SCA = 1, /* secondary channel above */
- SCB = 3, /* secondary channel below */
-};
-
u8 *rtw_get_ie(u8 *pbuf, signed int index, signed int *len, signed int limit);
u8 *rtw_get_ie_ex(u8 *in_ie, uint in_len, u8 eid, u8 *oui, u8 oui_len, u8 *ie, uint *ielen);
int rtw_ies_remove_ie(u8 *ies, uint *ies_len, uint offset, u8 eid, u8 *oui, u8 oui_len);
--
2.30.2
next prev parent reply other threads:[~2021-03-24 12:45 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 12:44 [PATCH 00/33] Staging: rtl8723bs: remove unnecessary enum names and definitions Marco Cesati
2021-03-24 12:44 ` [PATCH 01/33] Staging: rtl8723bs: remove named enums in rtw_mlme.h Marco Cesati
2021-03-24 13:42 ` Dan Carpenter
2021-03-24 15:01 ` Marco Cesati
2021-03-24 12:44 ` [PATCH 02/33] Staging: rtl8723bs: remove named enums in rtw_cmd.h Marco Cesati
2021-03-24 12:44 ` [PATCH 03/33] Staging: rtl8723bs: remove named enums in rtw_eeprom.h Marco Cesati
2021-03-24 12:44 ` [PATCH 04/33] Staging: rtl8723bs: remove named enums in hal_com.h Marco Cesati
2021-03-24 12:44 ` [PATCH 05/33] Staging: rtl8723bs: remove named enums in rtw_recv.h Marco Cesati
2021-03-24 12:44 ` [PATCH 06/33] Staging: rtl8723bs: remove named enums in drv_types.h Marco Cesati
2021-03-24 12:44 ` [PATCH 07/33] Staging: rtl8723bs: remove named enums in rtw_ht.h Marco Cesati
2021-03-24 12:44 ` [PATCH 08/33] Staging: rtl8723bs: remove named enums in wlan_bssdef.h Marco Cesati
2021-03-24 12:44 ` [PATCH 09/33] Staging: rtl8723bs: remove named enums in rtw_mp.h Marco Cesati
2021-03-24 12:44 ` [PATCH 10/33] Staging: rtl8723bs: remove named enums in osdep_service.h Marco Cesati
2021-03-24 12:44 ` [PATCH 11/33] Staging: rtl8723bs: remove named enums in hal_intf.h Marco Cesati
2021-03-24 12:44 ` [PATCH 12/33] Staging: rtl8723bs: remove named enums in rtw_pwrctrl.h Marco Cesati
2021-03-24 12:44 ` [PATCH 13/33] Staging: rtl8723bs: remove named enums in rtl8723b_cmd.h Marco Cesati
2021-03-24 12:44 ` [PATCH 14/33] Staging: rtl8723bs: remove named enums in hal_com_h2c.h Marco Cesati
2021-03-24 12:44 ` [PATCH 15/33] Staging: rtl8723bs: remove named enums in rtw_wifi_regd.h Marco Cesati
2021-03-24 12:44 ` [PATCH 16/33] Staging: rtl8723bs: remove named enums in wifi.h Marco Cesati
2021-03-24 12:44 ` [PATCH 17/33] Staging: rtl8723bs: remove named enums in rtl8723b_hal.h Marco Cesati
2021-03-24 12:44 ` [PATCH 18/33] Staging: rtl8723bs: remove named enums in hal_phy.h Marco Cesati
2021-03-24 12:44 ` [PATCH 19/33] Staging: rtl8723bs: remove named enums in rtw_mlme_ext.h Marco Cesati
2021-03-24 12:44 ` [PATCH 20/33] Staging: rtl8723bs: remove named enums in rtw_xmit.h Marco Cesati
2021-03-24 12:44 ` [PATCH 21/33] Staging: rtl8723bs: remove named enums in rtw_rf.h Marco Cesati
2021-03-24 12:44 ` [PATCH 22/33] Staging: rtl8723bs: remove named enums in HalPwrSeqCmd.h Marco Cesati
2021-03-24 12:44 ` [PATCH 23/33] Staging: rtl8723bs: remove named enums in hal_com_phycfg.h Marco Cesati
2021-03-24 12:44 ` Marco Cesati [this message]
2021-03-24 12:44 ` [PATCH 25/33] Staging: rtl8723bs: remove named enums in rtw_efuse.h Marco Cesati
2021-03-24 12:44 ` [PATCH 26/33] Staging: rtl8723bs: remove named enums in odm_interface.h Marco Cesati
2021-03-24 12:44 ` [PATCH 27/33] Staging: rtl8723bs: remove named enums in HalBtcOutSrc.h Marco Cesati
2021-03-24 12:44 ` [PATCH 28/33] Staging: rtl8723bs: remove named enums in HalBtc8723b1Ant.h Marco Cesati
2021-03-24 12:44 ` [PATCH 29/33] Staging: rtl8723bs: remove named enums in odm_types.h Marco Cesati
2021-03-24 12:44 ` [PATCH 30/33] Staging: rtl8723bs: remove named enums in odm_DIG.h Marco Cesati
2021-03-24 12:44 ` [PATCH 31/33] Staging: rtl8723bs: remove named enums in HalPhyRf.h Marco Cesati
2021-03-24 12:44 ` [PATCH 32/33] Staging: rtl8723bs: remove named enums in odm.h Marco Cesati
2021-03-24 12:44 ` [PATCH 33/33] Staging: rtl8723bs: remove named enums in HalBtc8723b2Ant.h Marco Cesati
2021-03-26 14:04 ` [PATCH 00/33] Staging: rtl8723bs: remove unnecessary enum names and definitions Greg Kroah-Hartman
2021-03-26 15:37 ` Marco Cesati
2021-03-26 16:09 ` Dan Carpenter
2021-03-26 16:19 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210324124456.25221-25-marcocesati@gmail.com \
--to=marcocesati@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.