Commit 7b506ff6 authored by Miaohe Lin's avatar Miaohe Lin Committed by Johannes Berg
Browse files

net: wireless: Convert to use the preferred fallthrough macro 



Convert the uses of fallthrough comments to fallthrough macro.

Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Link: https://lore.kernel.org/r/20200822082323.45495-1-linmiaohe@huawei.com


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

net/wireless/chan.c

+2 −2
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, 
		if (!ht_cap->ht_supported &&

		    chandef->chan->band != NL80211_BAND_6GHZ)

			return false;

		/* fall through */

		fallthrough;

	case NL80211_CHAN_WIDTH_20_NOHT:

		prohibited_flags |= IEEE80211_CHAN_NO_20MHZ;

		width = 20;
@@ -983,7 +983,7 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, 
		if (chandef->chan->band != NL80211_BAND_6GHZ &&

		    cap != IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ)

			return false;

		/* fall through */

		fallthrough;

	case NL80211_CHAN_WIDTH_80:

		prohibited_flags |= IEEE80211_CHAN_NO_80MHZ;

		width = 80;

net/wireless/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ void cfg80211_cac_event(struct net_device *netdev, 
		       sizeof(struct cfg80211_chan_def));

		queue_work(cfg80211_wq, &rdev->propagate_cac_done_wk);

		cfg80211_sched_dfs_chan_update(rdev);

		/* fall through */

		fallthrough;

	case NL80211_RADAR_CAC_ABORTED:

		wdev->cac_started = false;

		break;

net/wireless/nl80211.c

+10 −10
Original line number Diff line number Diff line
@@ -2105,7 +2105,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
		state->split_start++;

		if (state->split)

			break;

		/* fall through */

		fallthrough;

	case 1:

		if (nla_put(msg, NL80211_ATTR_CIPHER_SUITES,

			    sizeof(u32) * rdev->wiphy.n_cipher_suites,
@@ -2152,7 +2152,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
		state->split_start++;

		if (state->split)

			break;

		/* fall through */

		fallthrough;

	case 2:

		if (nl80211_put_iftypes(msg, NL80211_ATTR_SUPPORTED_IFTYPES,

					rdev->wiphy.interface_modes))
@@ -2160,7 +2160,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
		state->split_start++;

		if (state->split)

			break;

		/* fall through */

		fallthrough;

	case 3:

		nl_bands = nla_nest_start_noflag(msg,

						 NL80211_ATTR_WIPHY_BANDS);
@@ -2187,7 +2187,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
				state->chan_start++;

				if (state->split)

					break;

				/* fall through */

				fallthrough;

			default:

				/* add frequencies */

				nl_freqs = nla_nest_start_noflag(msg,
@@ -2242,7 +2242,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
			state->split_start++;

		if (state->split)

			break;

		/* fall through */

		fallthrough;

	case 4:

		nl_cmds = nla_nest_start_noflag(msg,

						NL80211_ATTR_SUPPORTED_COMMANDS);
@@ -2271,7 +2271,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
		state->split_start++;

		if (state->split)

			break;

		/* fall through */

		fallthrough;

	case 5:

		if (rdev->ops->remain_on_channel &&

		    (rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL) &&
@@ -2289,7 +2289,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
		state->split_start++;

		if (state->split)

			break;

		/* fall through */

		fallthrough;

	case 6:

#ifdef CONFIG_PM

		if (nl80211_send_wowlan(msg, rdev, state->split))
@@ -2300,7 +2300,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
#else

		state->split_start++;

#endif

		/* fall through */

		fallthrough;

	case 7:

		if (nl80211_put_iftypes(msg, NL80211_ATTR_SOFTWARE_IFTYPES,

					rdev->wiphy.software_iftypes))
@@ -2313,7 +2313,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
		state->split_start++;

		if (state->split)

			break;

		/* fall through */

		fallthrough;

	case 8:

		if ((rdev->wiphy.flags & WIPHY_FLAG_HAVE_AP_SME) &&

		    nla_put_u32(msg, NL80211_ATTR_DEVICE_AP_SME,
@@ -5205,7 +5205,7 @@ bool nl80211_put_sta_rate(struct sk_buff *msg, struct rate_info *info, int attr) 
		break;

	default:

		WARN_ON(1);

		/* fall through */

		fallthrough;

	case RATE_INFO_BW_20:

		rate_flg = 0;

		break;

net/wireless/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -1433,7 +1433,7 @@ cfg80211_inform_single_bss_data(struct wiphy *wiphy, 
	switch (ftype) {

	case CFG80211_BSS_FTYPE_BEACON:

		ies->from_beacon = true;

		/* fall through */

		fallthrough;

	case CFG80211_BSS_FTYPE_UNKNOWN:

		rcu_assign_pointer(tmp.pub.beacon_ies, ies);

		break;

net/wireless/sme.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev, 
		return err;

	case CFG80211_CONN_ASSOC_FAILED_TIMEOUT:

		*treason = NL80211_TIMEOUT_ASSOC;

		/* fall through */

		fallthrough;

	case CFG80211_CONN_ASSOC_FAILED:

		cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,

				     NULL, 0,
@@ -215,7 +215,7 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev, 
		cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,

				     NULL, 0,

				     WLAN_REASON_DEAUTH_LEAVING, false);

		/* fall through */

		fallthrough;

	case CFG80211_CONN_ABANDON:

		/* free directly, disconnected event already sent */

		cfg80211_sme_free(wdev);