Commit fc0561dc authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Johannes Berg
Browse files

mac80211: Use fallthrough pseudo-keyword 

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary
fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through



Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20200707204548.GA9320@embeddedor


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 504776be

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -4334,7 +4334,7 @@ static int __init init_mac80211_hwsim(void) 
			break;

		case HWSIM_REGTEST_STRICT_ALL:

			param.reg_strict = true;

			/* fall through */

			fallthrough;

		case HWSIM_REGTEST_DRIVER_REG_ALL:

			param.reg_alpha2 = hwsim_alpha2s[0];

			break;

net/mac80211/cfg.c

+3 −3
Original line number Diff line number Diff line
@@ -608,12 +608,12 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev, 
	case WLAN_CIPHER_SUITE_BIP_CMAC_256:

		BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=

			     offsetof(typeof(kseq), aes_cmac));

		/* fall through */

		fallthrough;

	case WLAN_CIPHER_SUITE_BIP_GMAC_128:

	case WLAN_CIPHER_SUITE_BIP_GMAC_256:

		BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=

			     offsetof(typeof(kseq), aes_gmac));

		/* fall through */

		fallthrough;

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP_256:

		BUILD_BUG_ON(offsetof(typeof(kseq), ccmp) !=
@@ -2336,7 +2336,7 @@ static int ieee80211_scan(struct wiphy *wiphy, 
		 * for now fall through to allow scanning only when

		 * beaconing hasn't been configured yet

		 */

		/* fall through */

		fallthrough;

	case NL80211_IFTYPE_AP:

		/*

		 * If the scan has been forced (and the driver supports

net/mac80211/chan.c

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local, 
		default:

			WARN_ONCE(1, "Invalid SMPS mode %d\n",

				  sdata->smps_mode);

			/* fall through */

			fallthrough;

		case IEEE80211_SMPS_OFF:

			needed_static = sdata->needed_rx_chains;

			needed_dynamic = sdata->needed_rx_chains;

net/mac80211/ht.c

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ bool ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata, 
	switch (sdata->vif.bss_conf.chandef.width) {

	default:

		WARN_ON_ONCE(1);

		/* fall through */

		fallthrough;

	case NL80211_CHAN_WIDTH_20_NOHT:

	case NL80211_CHAN_WIDTH_20:

		bw = IEEE80211_STA_RX_BW_20;
@@ -517,7 +517,7 @@ int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata, 
	case IEEE80211_SMPS_AUTOMATIC:

	case IEEE80211_SMPS_NUM_MODES:

		WARN_ON(1);

		/* fall through */

		fallthrough;

	case IEEE80211_SMPS_OFF:

		action_frame->u.action.u.ht_smps.smps_control =

				WLAN_HT_SMPS_CONTROL_DISABLED;

net/mac80211/ibss.c

+2 −2
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata, 
	case NL80211_CHAN_WIDTH_10:

	case NL80211_CHAN_WIDTH_20_NOHT:

		sta_flags |= IEEE80211_STA_DISABLE_HT;

		/* fall through */

		fallthrough;

	case NL80211_CHAN_WIDTH_20:

		sta_flags |= IEEE80211_STA_DISABLE_40MHZ;

		break;
@@ -1401,7 +1401,7 @@ ieee80211_ibss_setup_scan_channels(struct wiphy *wiphy, 
		break;

	case NL80211_CHAN_WIDTH_80P80:

		cf2 = chandef->center_freq2;

		/* fall through */

		fallthrough;

	case NL80211_CHAN_WIDTH_80:

		width = 80;

		break;