iwlwifi: Use fallthrough pseudo-keyword
Subsystems (3)
PATCH 1/1 iwlwifi: Use fallthrough pseudo-keyword
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1].
Signed-off-by Gustavo A. R. Silva <[email protected]>
--- drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 6 +++--- drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 2 +- drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 2 +- drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 2 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/led.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 8 ++++---- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 10 +++++----- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 4 ++-- 15 files changed, 25 insertions(+), 25 deletions(-)
drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c +1 -1
@@ -619,7 +619,7 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,switch (key->cipher) {case WLAN_CIPHER_SUITE_TKIP : key->flags |=IEEE80211_KEY_FLAG_GENERATE_MMIC ; -/* fall through */ + fallthrough;case WLAN_CIPHER_SUITE_CCMP : key->flags |=IEEE80211_KEY_FLAG_GENERATE_IV ;break ;
drivers/net/wireless/intel/iwlwifi/dvm/rx.c +3 -3
@@ -582,7 +582,7 @@ static int iwlagn_set_decrypted_flag(struct iwl_priv *priv,if ((decrypt_res &RX_RES_STATUS_DECRYPT_TYPE_MSK ) ==RX_RES_STATUS_BAD_KEY_TTAK )break ; -/* fall through */ + fallthrough;case RX_RES_STATUS_SEC_TYPE_WEP :if ((decrypt_res &RX_RES_STATUS_DECRYPT_TYPE_MSK ) ==RX_RES_STATUS_BAD_ICV_MIC ) {
@@ -591,7 +591,7 @@ static int iwlagn_set_decrypted_flag(struct iwl_priv *priv,IWL_DEBUG_RX (priv,"Packet destroyed\n" );return -1 ; } -/* fall through */ + fallthrough;case RX_RES_STATUS_SEC_TYPE_CCMP :if ((decrypt_res &RX_RES_STATUS_DECRYPT_TYPE_MSK ) ==RX_RES_STATUS_DECRYPT_OK ) {
@@ -720,7 +720,7 @@ static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in) decrypt_out |=RX_RES_STATUS_BAD_KEY_TTAK ;break ; } -/* fall through */ + fallthrough;default :if (!(decrypt_in &RX_MPDU_RES_STATUS_ICV_OK )) decrypt_out |=RX_RES_STATUS_BAD_ICV_MIC ;
drivers/net/wireless/intel/iwlwifi/dvm/scan.c +1 -1
@@ -406,7 +406,7 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time) limit = (limits[1 ] *98 ) /100 -IWL_CHANNEL_TUNE_TIME *2 ; limit /=2 ; dwell_time =min (limit, dwell_time); -/* fall through */ + fallthrough;case 1 : limit = (limits[0 ] *98 ) /100 -IWL_CHANNEL_TUNE_TIME *2 ; limit /= n_active;
drivers/net/wireless/intel/iwlwifi/dvm/sta.c +1 -1
@@ -1109,7 +1109,7 @@ static int iwlagn_send_sta_key(struct iwl_priv *priv,break ;case WLAN_CIPHER_SUITE_WEP104 : key_flags |=STA_KEY_FLG_KEY_SIZE_MSK ; -/* fall through */ + fallthrough;case WLAN_CIPHER_SUITE_WEP40 : key_flags |=STA_KEY_FLG_WEP ;memcpy (&sta_cmd.key.key[3 ], keyconf->key, keyconf->keylen);
drivers/net/wireless/intel/iwlwifi/dvm/tx.c +1 -1
@@ -210,7 +210,7 @@ static void iwlagn_tx_cmd_build_hwcrypto(struct iwl_priv *priv,case WLAN_CIPHER_SUITE_WEP104 : tx_cmd->sec_ctl |=TX_CMD_SEC_KEY128 ; -/* fall through */ + fallthrough;case WLAN_CIPHER_SUITE_WEP40 : tx_cmd->sec_ctl |= (TX_CMD_SEC_WEP | (keyconf->keyidx &TX_CMD_SEC_MSK ) <<TX_CMD_SEC_SHIFT );
drivers/net/wireless/intel/iwlwifi/iwl-drv.c +1 -1
@@ -1561,7 +1561,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)break ;default :WARN (1 ,"Invalid fw type %d\n" , fw->type); -/* fall through */ + fallthrough;case IWL_FW_MVM : op = &iwlwifi_opmode_table[MVM_OP_MODE ];break ;
drivers/net/wireless/intel/iwlwifi/mvm/led.c +1 -1
@@ -115,7 +115,7 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm)switch (mode) {case IWL_LED_BLINK :IWL_ERR (mvm,"Blink led mode not supported, used default\n" ); -/* fall through */ + fallthrough;case IWL_LED_DEFAULT :case IWL_LED_RF_STATE : mode =IWL_LED_RF_STATE ;
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +1 -1
@@ -289,7 +289,7 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif)case NL80211_IFTYPE_STATION :if (!vif->p2p)break ; -/* fall through */ + fallthrough;default :__clear_bit (0 , data.available_mac_ids); }
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +1 -1
@@ -4059,7 +4059,7 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm, mvmvif->ap_ibss_active = true;break ; } -/* fall through */ + fallthrough;case NL80211_IFTYPE_ADHOC :/* * The AP binding flow is handled as part of the start_ap flow
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +1 -1
@@ -109,7 +109,7 @@ u8 iwl_mvm_get_ctrl_pos(struct cfg80211_chan_def *chandef)return PHY_VHT_CTRL_POS_4_ABOVE ;default :WARN (1 ,"Invalid channel definition" ); -/* fall through */ + fallthrough;case 0 :/* * The FW is expected to check the control channel position only
drivers/net/wireless/intel/iwlwifi/mvm/rx.c +1 -1
@@ -226,7 +226,7 @@ static u32 iwl_mvm_set_mac80211_rx_flag(struct iwl_mvm *mvm, !(rx_pkt_status & RX_MPDU_RES_STATUS_TTAK_OK))return 0 ; *crypt_len =IEEE80211_TKIP_IV_LEN ; -/* fall through */ + fallthrough;case RX_MPDU_RES_STATUS_SEC_WEP_ENC :if (!(rx_pkt_status &RX_MPDU_RES_STATUS_ICV_OK ))
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +4 -4
@@ -354,7 +354,7 @@ static int iwl_mvm_rx_crypto(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr, stats->flag |=RX_FLAG_MMIC_ERROR ; *crypt_len =IEEE80211_TKIP_IV_LEN ; -/* fall through */ + fallthrough;case IWL_RX_MPDU_STATUS_SEC_WEP :if (!(status &IWL_RX_MPDU_STATUS_ICV_OK ))return -1 ;
@@ -1275,7 +1275,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm, he->data4 |=le16_encode_bits (le32_get_bits (phy_data->d2,IWL_RX_PHY_DATA2_HE_TB_EXT_SPTL_REUSE4 ),IEEE80211_RADIOTAP_HE_DATA4_TB_SPTL_REUSE4 ); -/* fall through */ + fallthrough;case IWL_RX_PHY_INFO_TYPE_HE_SU :case IWL_RX_PHY_INFO_TYPE_HE_MU :case IWL_RX_PHY_INFO_TYPE_HE_MU_EXT :
@@ -1348,7 +1348,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm, IWL_RX_PHY_DATA4_HE_MU_EXT_PREAMBLE_PUNC_TYPE_MASK), IEEE80211_RADIOTAP_HE_MU_FLAGS2_PUNC_FROM_SIG_A_BW);iwl_mvm_decode_he_mu_ext (mvm, phy_data, rate_n_flags, he_mu); -/* fall through */ + fallthrough;case IWL_RX_PHY_INFO_TYPE_HE_MU : he_mu->flags2 |= le16_encode_bits(le32_get_bits(phy_data->d1,
@@ -1358,7 +1358,7 @@ static void iwl_mvm_decode_he_phy_data(struct iwl_mvm *mvm,le16_encode_bits (le32_get_bits (phy_data->d1,IWL_RX_PHY_DATA1_HE_MU_SIGB_COMPRESSION ),IEEE80211_RADIOTAP_HE_MU_FLAGS2_SIG_B_COMP ); -/* fall through */ + fallthrough;case IWL_RX_PHY_INFO_TYPE_HE_TB :case IWL_RX_PHY_INFO_TYPE_HE_TB_EXT : iwl_mvm_decode_he_phy_ru_alloc(phy_data, rate_n_flags,
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +1 -1
@@ -2149,7 +2149,7 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)/* Something is wrong if no scan was running but we * ran out of scans. */ -/* fall through */ + fallthrough;default :WARN_ON (1 );break ;
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +5 -5
@@ -144,13 +144,13 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta,switch (sta->bandwidth) {case IEEE80211_STA_RX_BW_160 : add_sta_cmd.station_flags |=cpu_to_le32 (STA_FLG_FAT_EN_160MHZ ); -/* fall through */ + fallthrough;case IEEE80211_STA_RX_BW_80 : add_sta_cmd.station_flags |=cpu_to_le32 (STA_FLG_FAT_EN_80MHZ ); -/* fall through */ + fallthrough;case IEEE80211_STA_RX_BW_40 : add_sta_cmd.station_flags |=cpu_to_le32 (STA_FLG_FAT_EN_40MHZ ); -/* fall through */ + fallthrough;case IEEE80211_STA_RX_BW_20 :if (sta->ht_cap.ht_supported) add_sta_cmd.station_flags |=
@@ -3258,14 +3258,14 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,break ;case WLAN_CIPHER_SUITE_WEP104 : key_flags |=cpu_to_le16 (STA_KEY_FLG_WEP_13BYTES ); -/* fall through */ + fallthrough;case WLAN_CIPHER_SUITE_WEP40 : key_flags |=cpu_to_le16 (STA_KEY_FLG_WEP );memcpy (u.cmd.common.key +3 , key->key, key->keylen);break ;case WLAN_CIPHER_SUITE_GCMP_256 : key_flags |=cpu_to_le16 (STA_KEY_FLG_KEY_32BYTES ); -/* fall through */ + fallthrough;case WLAN_CIPHER_SUITE_GCMP : key_flags |=cpu_to_le16 (STA_KEY_FLG_GCMP );memcpy (u.cmd.common.key, key->key, key->keylen);
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +2 -2
@@ -459,7 +459,7 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,case WLAN_CIPHER_SUITE_WEP104 : tx_cmd->sec_ctl |=TX_CMD_SEC_KEY128 ; -/* fall through */ + fallthrough;case WLAN_CIPHER_SUITE_WEP40 : tx_cmd->sec_ctl |= TX_CMD_SEC_WEP | ((keyconf->keyidx << TX_CMD_SEC_WEP_KEY_IDX_POS) &
@@ -470,7 +470,7 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm,case WLAN_CIPHER_SUITE_GCMP :case WLAN_CIPHER_SUITE_GCMP_256 : type =TX_CMD_SEC_GCMP ; -/* Fall through */ + fallthrough;case WLAN_CIPHER_SUITE_CCMP_256 :/* TODO: Taking the key from the table might introduce a race * when PTK rekeying is done, having an old packets with a PN
Signature · 1 line
2.27.0