wifi: cfg80211: use BIT() for flag enums

Use BIT(x) instead of 1<<x, in part because it's mostly
missing spaces anyway, in part because it reads nicer.

Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://msgid.link/20240523120945.c21598fbf49c.Ib8f26c5e9f508aee19fdfa1fd4b5995f084c46d4@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 5da9bb0ac6a4782fc843597090c4b4724e5dbc29..051d4eb227bf0534152d56fbaa3f323cc3534bb6 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -127,31 +127,31 @@ struct wiphy;
  *     even if it is otherwise disabled.
  */
 enum ieee80211_channel_flags {
-       IEEE80211_CHAN_DISABLED         = 1<<0,
-       IEEE80211_CHAN_NO_IR            = 1<<1,
-       IEEE80211_CHAN_PSD              = 1<<2,
-       IEEE80211_CHAN_RADAR            = 1<<3,
-       IEEE80211_CHAN_NO_HT40PLUS      = 1<<4,
-       IEEE80211_CHAN_NO_HT40MINUS     = 1<<5,
-       IEEE80211_CHAN_NO_OFDM          = 1<<6,
-       IEEE80211_CHAN_NO_80MHZ         = 1<<7,
-       IEEE80211_CHAN_NO_160MHZ        = 1<<8,
-       IEEE80211_CHAN_INDOOR_ONLY      = 1<<9,
-       IEEE80211_CHAN_IR_CONCURRENT    = 1<<10,
-       IEEE80211_CHAN_NO_20MHZ         = 1<<11,
-       IEEE80211_CHAN_NO_10MHZ         = 1<<12,
-       IEEE80211_CHAN_NO_HE            = 1<<13,
-       IEEE80211_CHAN_1MHZ             = 1<<14,
-       IEEE80211_CHAN_2MHZ             = 1<<15,
-       IEEE80211_CHAN_4MHZ             = 1<<16,
-       IEEE80211_CHAN_8MHZ             = 1<<17,
-       IEEE80211_CHAN_16MHZ            = 1<<18,
-       IEEE80211_CHAN_NO_320MHZ        = 1<<19,
-       IEEE80211_CHAN_NO_EHT           = 1<<20,
-       IEEE80211_CHAN_DFS_CONCURRENT   = 1<<21,
-       IEEE80211_CHAN_NO_6GHZ_VLP_CLIENT = 1<<22,
-       IEEE80211_CHAN_NO_6GHZ_AFC_CLIENT = 1<<23,
-       IEEE80211_CHAN_CAN_MONITOR      = 1<<24,
+       IEEE80211_CHAN_DISABLED                 = BIT(0),
+       IEEE80211_CHAN_NO_IR                    = BIT(1),
+       IEEE80211_CHAN_PSD                      = BIT(2),
+       IEEE80211_CHAN_RADAR                    = BIT(3),
+       IEEE80211_CHAN_NO_HT40PLUS              = BIT(4),
+       IEEE80211_CHAN_NO_HT40MINUS             = BIT(5),
+       IEEE80211_CHAN_NO_OFDM                  = BIT(6),
+       IEEE80211_CHAN_NO_80MHZ                 = BIT(7),
+       IEEE80211_CHAN_NO_160MHZ                = BIT(8),
+       IEEE80211_CHAN_INDOOR_ONLY              = BIT(9),
+       IEEE80211_CHAN_IR_CONCURRENT            = BIT(10),
+       IEEE80211_CHAN_NO_20MHZ                 = BIT(11),
+       IEEE80211_CHAN_NO_10MHZ                 = BIT(12),
+       IEEE80211_CHAN_NO_HE                    = BIT(13),
+       IEEE80211_CHAN_1MHZ                     = BIT(14),
+       IEEE80211_CHAN_2MHZ                     = BIT(15),
+       IEEE80211_CHAN_4MHZ                     = BIT(16),
+       IEEE80211_CHAN_8MHZ                     = BIT(17),
+       IEEE80211_CHAN_16MHZ                    = BIT(18),
+       IEEE80211_CHAN_NO_320MHZ                = BIT(19),
+       IEEE80211_CHAN_NO_EHT                   = BIT(20),
+       IEEE80211_CHAN_DFS_CONCURRENT           = BIT(21),
+       IEEE80211_CHAN_NO_6GHZ_VLP_CLIENT       = BIT(22),
+       IEEE80211_CHAN_NO_6GHZ_AFC_CLIENT       = BIT(23),
+       IEEE80211_CHAN_CAN_MONITOR              = BIT(24),
 };
 
 #define IEEE80211_CHAN_NO_HT40 \
@@ -229,13 +229,13 @@ struct ieee80211_channel {
  * @IEEE80211_RATE_SUPPORTS_10MHZ: Rate can be used in 10 MHz mode
  */
 enum ieee80211_rate_flags {
-       IEEE80211_RATE_SHORT_PREAMBLE   = 1<<0,
-       IEEE80211_RATE_MANDATORY_A      = 1<<1,
-       IEEE80211_RATE_MANDATORY_B      = 1<<2,
-       IEEE80211_RATE_MANDATORY_G      = 1<<3,
-       IEEE80211_RATE_ERP_G            = 1<<4,
-       IEEE80211_RATE_SUPPORTS_5MHZ    = 1<<5,
-       IEEE80211_RATE_SUPPORTS_10MHZ   = 1<<6,
+       IEEE80211_RATE_SHORT_PREAMBLE   = BIT(0),
+       IEEE80211_RATE_MANDATORY_A      = BIT(1),
+       IEEE80211_RATE_MANDATORY_B      = BIT(2),
+       IEEE80211_RATE_MANDATORY_G      = BIT(3),
+       IEEE80211_RATE_ERP_G            = BIT(4),
+       IEEE80211_RATE_SUPPORTS_5MHZ    = BIT(5),
+       IEEE80211_RATE_SUPPORTS_10MHZ   = BIT(6),
 };
 
 /**
@@ -1957,9 +1957,9 @@ struct rate_info {
  * @BSS_PARAM_FLAGS_SHORT_SLOT_TIME: whether short slot time is enabled
  */
 enum bss_param_flags {
-       BSS_PARAM_FLAGS_CTS_PROT        = 1<<0,
-       BSS_PARAM_FLAGS_SHORT_PREAMBLE  = 1<<1,
-       BSS_PARAM_FLAGS_SHORT_SLOT_TIME = 1<<2,
+       BSS_PARAM_FLAGS_CTS_PROT        = BIT(0),
+       BSS_PARAM_FLAGS_SHORT_PREAMBLE  = BIT(1),
+       BSS_PARAM_FLAGS_SHORT_SLOT_TIME = BIT(2),
 };
 
 /**
@@ -2266,13 +2266,13 @@ static inline int cfg80211_get_station(struct net_device *dev,
  * @MONITOR_FLAG_ACTIVE: active monitor, ACKs frames on its MAC address
  */
 enum monitor_flags {
-       MONITOR_FLAG_CHANGED            = 1<<__NL80211_MNTR_FLAG_INVALID,
-       MONITOR_FLAG_FCSFAIL            = 1<<NL80211_MNTR_FLAG_FCSFAIL,
-       MONITOR_FLAG_PLCPFAIL           = 1<<NL80211_MNTR_FLAG_PLCPFAIL,
-       MONITOR_FLAG_CONTROL            = 1<<NL80211_MNTR_FLAG_CONTROL,
-       MONITOR_FLAG_OTHER_BSS          = 1<<NL80211_MNTR_FLAG_OTHER_BSS,
-       MONITOR_FLAG_COOK_FRAMES        = 1<<NL80211_MNTR_FLAG_COOK_FRAMES,
-       MONITOR_FLAG_ACTIVE             = 1<<NL80211_MNTR_FLAG_ACTIVE,
+       MONITOR_FLAG_CHANGED            = BIT(__NL80211_MNTR_FLAG_INVALID),
+       MONITOR_FLAG_FCSFAIL            = BIT(NL80211_MNTR_FLAG_FCSFAIL),
+       MONITOR_FLAG_PLCPFAIL           = BIT(NL80211_MNTR_FLAG_PLCPFAIL),
+       MONITOR_FLAG_CONTROL            = BIT(NL80211_MNTR_FLAG_CONTROL),
+       MONITOR_FLAG_OTHER_BSS          = BIT(NL80211_MNTR_FLAG_OTHER_BSS),
+       MONITOR_FLAG_COOK_FRAMES        = BIT(NL80211_MNTR_FLAG_COOK_FRAMES),
+       MONITOR_FLAG_ACTIVE             = BIT(NL80211_MNTR_FLAG_ACTIVE),
 };
 
 /**
@@ -3399,15 +3399,15 @@ enum cfg80211_connect_params_changed {
  * @WIPHY_PARAM_TXQ_QUANTUM: TXQ scheduler quantum
  */
 enum wiphy_params_flags {
-       WIPHY_PARAM_RETRY_SHORT         = 1 << 0,
-       WIPHY_PARAM_RETRY_LONG          = 1 << 1,
-       WIPHY_PARAM_FRAG_THRESHOLD      = 1 << 2,
-       WIPHY_PARAM_RTS_THRESHOLD       = 1 << 3,
-       WIPHY_PARAM_COVERAGE_CLASS      = 1 << 4,
-       WIPHY_PARAM_DYN_ACK             = 1 << 5,
-       WIPHY_PARAM_TXQ_LIMIT           = 1 << 6,
-       WIPHY_PARAM_TXQ_MEMORY_LIMIT    = 1 << 7,
-       WIPHY_PARAM_TXQ_QUANTUM         = 1 << 8,
+       WIPHY_PARAM_RETRY_SHORT         = BIT(0),
+       WIPHY_PARAM_RETRY_LONG          = BIT(1),
+       WIPHY_PARAM_FRAG_THRESHOLD      = BIT(2),
+       WIPHY_PARAM_RTS_THRESHOLD       = BIT(3),
+       WIPHY_PARAM_COVERAGE_CLASS      = BIT(4),
+       WIPHY_PARAM_DYN_ACK             = BIT(5),
+       WIPHY_PARAM_TXQ_LIMIT           = BIT(6),
+       WIPHY_PARAM_TXQ_MEMORY_LIMIT    = BIT(7),
+       WIPHY_PARAM_TXQ_QUANTUM         = BIT(8),
 };
 
 #define IEEE80211_DEFAULT_AIRTIME_WEIGHT       256