git.osdn.net Git - uclinux-h8/linux.git/commit

mac80211: clean up rate encoding bits in RX status

In preparation for adding support for HE rates, clean up
the driver report encoding for rate/bandwidth reporting
on RX frames.

Much of this patch was done with the following spatch:

@@
expression status;
@@
-status->flag & (RX_FLAG_HT | RX_FLAG_VHT)
+status->enc_flags & (RX_ENC_FLAG_HT | RX_ENC_FLAG_VHT)

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_SHORTPRE
+status->enc_flags op RX_ENC_FLAG_SHORTPRE
@@
expression status;
@@
-status->flag & RX_FLAG_SHORTPRE
+status->enc_flags & RX_ENC_FLAG_SHORTPRE

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_HT
+status->enc_flags op RX_ENC_FLAG_HT
@@
expression status;
@@
-status->flag & RX_FLAG_HT
+status->enc_flags & RX_ENC_FLAG_HT

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_40MHZ
+status->enc_flags op RX_ENC_FLAG_40MHZ
@@
expression status;
@@
-status->flag & RX_FLAG_40MHZ
+status->enc_flags & RX_ENC_FLAG_40MHZ

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_SHORT_GI
+status->enc_flags op RX_ENC_FLAG_SHORT_GI
@@
expression status;
@@
-status->flag & RX_FLAG_SHORT_GI
+status->enc_flags & RX_ENC_FLAG_SHORT_GI

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_HT_GF
+status->enc_flags op RX_ENC_FLAG_HT_GF
@@
expression status;
@@
-status->flag & RX_FLAG_HT_GF
+status->enc_flags & RX_ENC_FLAG_HT_GF

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_VHT
+status->enc_flags op RX_ENC_FLAG_VHT
@@
expression status;
@@
-status->flag & RX_FLAG_VHT
+status->enc_flags & RX_ENC_FLAG_VHT

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_STBC_MASK
+status->enc_flags op RX_ENC_FLAG_STBC_MASK
@@
expression status;
@@
-status->flag & RX_FLAG_STBC_MASK
+status->enc_flags & RX_ENC_FLAG_STBC_MASK

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_LDPC
+status->enc_flags op RX_ENC_FLAG_LDPC
@@
expression status;
@@
-status->flag & RX_FLAG_LDPC
+status->enc_flags & RX_ENC_FLAG_LDPC

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_10MHZ
+status->enc_flags op RX_ENC_FLAG_10MHZ
@@
expression status;
@@
-status->flag & RX_FLAG_10MHZ
+status->enc_flags & RX_ENC_FLAG_10MHZ

@@
assignment operator op;
expression status;
@@
-status->flag op RX_FLAG_5MHZ
+status->enc_flags op RX_ENC_FLAG_5MHZ
@@
expression status;
@@
-status->flag & RX_FLAG_5MHZ
+status->enc_flags & RX_ENC_FLAG_5MHZ

@@
assignment operator op;
expression status;
@@
-status->vht_flag op RX_VHT_FLAG_80MHZ
+status->enc_flags op RX_ENC_FLAG_80MHZ
@@
expression status;
@@
-status->vht_flag & RX_VHT_FLAG_80MHZ
+status->enc_flags & RX_ENC_FLAG_80MHZ

@@
assignment operator op;
expression status;
@@
-status->vht_flag op RX_VHT_FLAG_160MHZ
+status->enc_flags op RX_ENC_FLAG_160MHZ
@@
expression status;
@@
-status->vht_flag & RX_VHT_FLAG_160MHZ
+status->enc_flags & RX_ENC_FLAG_160MHZ

@@
assignment operator op;
expression status;
@@
-status->vht_flag op RX_VHT_FLAG_BF
+status->enc_flags op RX_ENC_FLAG_BF
@@
expression status;
@@
-status->vht_flag & RX_VHT_FLAG_BF
+status->enc_flags & RX_ENC_FLAG_BF

@@
assignment operator op;
expression status, STBC;
@@
-status->flag op STBC << RX_FLAG_STBC_SHIFT
+status->enc_flags op STBC << RX_ENC_FLAG_STBC_SHIFT

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_SHORTPRE
+status.enc_flags op RX_ENC_FLAG_SHORTPRE
@@
expression status;
@@
-status.flag & RX_FLAG_SHORTPRE
+status.enc_flags & RX_ENC_FLAG_SHORTPRE

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_HT
+status.enc_flags op RX_ENC_FLAG_HT
@@
expression status;
@@
-status.flag & RX_FLAG_HT
+status.enc_flags & RX_ENC_FLAG_HT

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_40MHZ
+status.enc_flags op RX_ENC_FLAG_40MHZ
@@
expression status;
@@
-status.flag & RX_FLAG_40MHZ
+status.enc_flags & RX_ENC_FLAG_40MHZ

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_SHORT_GI
+status.enc_flags op RX_ENC_FLAG_SHORT_GI
@@
expression status;
@@
-status.flag & RX_FLAG_SHORT_GI
+status.enc_flags & RX_ENC_FLAG_SHORT_GI

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_HT_GF
+status.enc_flags op RX_ENC_FLAG_HT_GF
@@
expression status;
@@
-status.flag & RX_FLAG_HT_GF
+status.enc_flags & RX_ENC_FLAG_HT_GF

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_VHT
+status.enc_flags op RX_ENC_FLAG_VHT
@@
expression status;
@@
-status.flag & RX_FLAG_VHT
+status.enc_flags & RX_ENC_FLAG_VHT

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_STBC_MASK
+status.enc_flags op RX_ENC_FLAG_STBC_MASK
@@
expression status;
@@
-status.flag & RX_FLAG_STBC_MASK
+status.enc_flags & RX_ENC_FLAG_STBC_MASK

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_LDPC
+status.enc_flags op RX_ENC_FLAG_LDPC
@@
expression status;
@@
-status.flag & RX_FLAG_LDPC
+status.enc_flags & RX_ENC_FLAG_LDPC

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_10MHZ
+status.enc_flags op RX_ENC_FLAG_10MHZ
@@
expression status;
@@
-status.flag & RX_FLAG_10MHZ
+status.enc_flags & RX_ENC_FLAG_10MHZ

@@
assignment operator op;
expression status;
@@
-status.flag op RX_FLAG_5MHZ
+status.enc_flags op RX_ENC_FLAG_5MHZ
@@
expression status;
@@
-status.flag & RX_FLAG_5MHZ
+status.enc_flags & RX_ENC_FLAG_5MHZ

@@
assignment operator op;
expression status;
@@
-status.vht_flag op RX_VHT_FLAG_80MHZ
+status.enc_flags op RX_ENC_FLAG_80MHZ
@@
expression status;
@@
-status.vht_flag & RX_VHT_FLAG_80MHZ
+status.enc_flags & RX_ENC_FLAG_80MHZ

@@
assignment operator op;
expression status;
@@
-status.vht_flag op RX_VHT_FLAG_160MHZ
+status.enc_flags op RX_ENC_FLAG_160MHZ
@@
expression status;
@@
-status.vht_flag & RX_VHT_FLAG_160MHZ
+status.enc_flags & RX_ENC_FLAG_160MHZ

@@
assignment operator op;
expression status;
@@
-status.vht_flag op RX_VHT_FLAG_BF
+status.enc_flags op RX_ENC_FLAG_BF
@@
expression status;
@@
-status.vht_flag & RX_VHT_FLAG_BF
+status.enc_flags & RX_ENC_FLAG_BF

@@
assignment operator op;
expression status, STBC;
@@
-status.flag op STBC << RX_FLAG_STBC_SHIFT
+status.enc_flags op STBC << RX_ENC_FLAG_STBC_SHIFT

@@
@@
-RX_FLAG_STBC_SHIFT
+RX_ENC_FLAG_STBC_SHIFT

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

author	Johannes Berg <johannes.berg@intel.com>
	Wed, 26 Apr 2017 09:13:00 +0000 (11:13 +0200)
committer	Johannes Berg <johannes.berg@intel.com>
	Fri, 28 Apr 2017 08:41:38 +0000 (10:41 +0200)
commit	7fdd69c5af2160236e97668bc1fb7d70855c66ae
tree	a06f532c192684582fca17267be6daa795848c2d	tree \| snapshot
parent	e5f2e0671e7ffb0723c5d96684d8fa1ea2403074	commit \| diff

drivers/net/wireless/ath/ath10k/htt_rx.c		diff \| blob \| history
drivers/net/wireless/ath/ath5k/base.c		diff \| blob \| history
drivers/net/wireless/ath/ath9k/ar9003_mac.c		diff \| blob \| history
drivers/net/wireless/ath/ath9k/common.c		diff \| blob \| history
drivers/net/wireless/ath/ath9k/debug_sta.c		diff \| blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c		diff \| blob \| history
drivers/net/wireless/ath/ath9k/mac.c		diff \| blob \| history
drivers/net/wireless/ath/ath9k/mac.h		diff \| blob \| history
drivers/net/wireless/ath/ath9k/recv.c		diff \| blob \| history
drivers/net/wireless/ath/carl9170/rx.c		diff \| blob \| history
drivers/net/wireless/ath/wcn36xx/txrx.c		diff \| blob \| history
drivers/net/wireless/broadcom/b43/xmit.c		diff \| blob \| history
drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c		diff \| blob \| history
drivers/net/wireless/intel/iwlegacy/3945.c		diff \| blob \| history
drivers/net/wireless/intel/iwlegacy/4965-mac.c		diff \| blob \| history
drivers/net/wireless/intel/iwlwifi/dvm/rx.c		diff \| blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/rx.c		diff \| blob \| history
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c		diff \| blob \| history
drivers/net/wireless/intersil/p54/txrx.c		diff \| blob \| history
drivers/net/wireless/mac80211_hwsim.c		diff \| blob \| history
drivers/net/wireless/marvell/mwl8k.c		diff \| blob \| history
drivers/net/wireless/mediatek/mt7601u/mac.c		diff \| blob \| history
drivers/net/wireless/ralink/rt2x00/rt2800lib.c		diff \| blob \| history
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c		diff \| blob \| history
drivers/net/wireless/ralink/rt2x00/rt2x00queue.h		diff \| blob \| history
drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c		diff \| blob \| history
drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c		diff \| blob \| history
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c		diff \| blob \| history
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c		diff \| blob \| history
drivers/net/wireless/st/cw1200/txrx.c		diff \| blob \| history
drivers/net/wireless/ti/wl1251/rx.c		diff \| blob \| history
drivers/net/wireless/ti/wlcore/rx.c		diff \| blob \| history
include/net/mac80211.h		diff \| blob \| history
net/mac80211/ibss.c		diff \| blob \| history
net/mac80211/ieee80211_i.h		diff \| blob \| history
net/mac80211/rx.c		diff \| blob \| history
net/mac80211/scan.c		diff \| blob \| history
net/mac80211/sta_info.h		diff \| blob \| history
net/mac80211/util.c		diff \| blob \| history