mac80211: separate encoding/bandwidth from flags
We currently use a lot of flags that are mutually incompatible,
separate this out into actual encoding and bandwidth enum values.
Much of this again done with spatch, with manual post-editing,
mostly to add the switch statements and get rid of the conversions.
@@
expression status;
@@
-status->enc_flags |= RX_ENC_FLAG_80MHZ
+status->bw = RATE_INFO_BW_80
@@
expression status;
@@
-status->enc_flags |= RX_ENC_FLAG_40MHZ
+status->bw = RATE_INFO_BW_40
@@
expression status;
@@
-status->enc_flags |= RX_ENC_FLAG_20MHZ
+status->bw = RATE_INFO_BW_20
@@
expression status;
@@
-status->enc_flags |= RX_ENC_FLAG_160MHZ
+status->bw = RATE_INFO_BW_160
@@
expression status;
@@
-status->enc_flags |= RX_ENC_FLAG_5MHZ
+status->bw = RATE_INFO_BW_5
@@
expression status;
@@
-status->enc_flags |= RX_ENC_FLAG_10MHZ
+status->bw = RATE_INFO_BW_10
@@
expression status;
@@
-status->enc_flags |= RX_ENC_FLAG_VHT
+status->encoding = RX_ENC_VHT
@@
expression status;
@@
-status->enc_flags |= RX_ENC_FLAG_HT
+status->encoding = RX_ENC_HT
@@
expression status;
@@
-status.enc_flags |= RX_ENC_FLAG_VHT
+status.encoding = RX_ENC_VHT
@@
expression status;
@@
-status.enc_flags |= RX_ENC_FLAG_HT
+status.encoding = RX_ENC_HT
@@
expression status;
@@
-(status->enc_flags & RX_ENC_FLAG_HT)
+(status->encoding == RX_ENC_HT)
@@
expression status;
@@
-(status->enc_flags & RX_ENC_FLAG_VHT)
+(status->encoding == RX_ENC_VHT)
@@
expression status;
@@
-(status->enc_flags & RX_ENC_FLAG_5MHZ)
+(status->bw == RATE_INFO_BW_5)
@@
expression status;
@@
-(status->enc_flags & RX_ENC_FLAG_10MHZ)
+(status->bw == RATE_INFO_BW_10)
@@
expression status;
@@
-(status->enc_flags & RX_ENC_FLAG_40MHZ)
+(status->bw == RATE_INFO_BW_40)
@@
expression status;
@@
-(status->enc_flags & RX_ENC_FLAG_80MHZ)
+(status->bw == RATE_INFO_BW_80)
@@
expression status;
@@
-(status->enc_flags & RX_ENC_FLAG_160MHZ)
+(status->bw == RATE_INFO_BW_160)
Signed-off-by:
Johannes Berg <johannes.berg@intel.com>
Showing
- drivers/net/wireless/ath/ath10k/htt_rx.c 14 additions, 18 deletionsdrivers/net/wireless/ath/ath10k/htt_rx.c
- drivers/net/wireless/ath/ath5k/base.c 2 additions, 2 deletionsdrivers/net/wireless/ath/ath5k/base.c
- drivers/net/wireless/ath/ath9k/ar9003_mac.c 1 addition, 0 deletionsdrivers/net/wireless/ath/ath9k/ar9003_mac.c
- drivers/net/wireless/ath/ath9k/common.c 5 additions, 3 deletionsdrivers/net/wireless/ath/ath9k/common.c
- drivers/net/wireless/ath/ath9k/debug_sta.c 1 addition, 1 deletiondrivers/net/wireless/ath/ath9k/debug_sta.c
- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c 2 additions, 1 deletiondrivers/net/wireless/ath/ath9k/htc_drv_txrx.c
- drivers/net/wireless/ath/ath9k/mac.c 1 addition, 0 deletionsdrivers/net/wireless/ath/ath9k/mac.c
- drivers/net/wireless/ath/ath9k/mac.h 2 additions, 0 deletionsdrivers/net/wireless/ath/ath9k/mac.h
- drivers/net/wireless/ath/ath9k/recv.c 2 additions, 2 deletionsdrivers/net/wireless/ath/ath9k/recv.c
- drivers/net/wireless/ath/carl9170/rx.c 2 additions, 2 deletionsdrivers/net/wireless/ath/carl9170/rx.c
- drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c 2 additions, 2 deletionsdrivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
- drivers/net/wireless/intel/iwlegacy/4965-mac.c 1 addition, 1 deletiondrivers/net/wireless/intel/iwlegacy/4965-mac.c
- drivers/net/wireless/intel/iwlwifi/dvm/rx.c 1 addition, 1 deletiondrivers/net/wireless/intel/iwlwifi/dvm/rx.c
- drivers/net/wireless/intel/iwlwifi/mvm/rx.c 5 additions, 5 deletionsdrivers/net/wireless/intel/iwlwifi/mvm/rx.c
- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c 5 additions, 5 deletionsdrivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
- drivers/net/wireless/mac80211_hwsim.c 2 additions, 2 deletionsdrivers/net/wireless/mac80211_hwsim.c
- drivers/net/wireless/marvell/mwl8k.c 6 additions, 6 deletionsdrivers/net/wireless/marvell/mwl8k.c
- drivers/net/wireless/mediatek/mt7601u/mac.c 2 additions, 2 deletionsdrivers/net/wireless/mediatek/mt7601u/mac.c
- drivers/net/wireless/ralink/rt2x00/rt2800lib.c 1 addition, 1 deletiondrivers/net/wireless/ralink/rt2x00/rt2800lib.c
- drivers/net/wireless/ralink/rt2x00/rt2x00dev.c 3 additions, 1 deletiondrivers/net/wireless/ralink/rt2x00/rt2x00dev.c
Please register or sign in to comment