mac80211: process mesh channel switching using beacon (33a45867) · Commits · 戴 / test

net/mac80211/mesh.c

+130 −9

Original line number	Diff line number	Diff line
		@@ -850,6 +850,127 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
		ieee80211_configure_filter(local);
		}

		static bool
		ieee80211_mesh_process_chnswitch(struct ieee80211_sub_if_data *sdata,
		struct ieee802_11_elems *elems, bool beacon)
		{
		struct cfg80211_csa_settings params;
		struct ieee80211_csa_ie csa_ie;
		struct ieee80211_chanctx_conf *chanctx_conf;
		struct ieee80211_chanctx *chanctx;
		struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
		enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
		int err, num_chanctx;
		u32 sta_flags;

		if (sdata->vif.csa_active)
		return true;

		if (!ifmsh->mesh_id)
		return false;

		sta_flags = IEEE80211_STA_DISABLE_VHT;
		switch (sdata->vif.bss_conf.chandef.width) {
		case NL80211_CHAN_WIDTH_20_NOHT:
		sta_flags \|= IEEE80211_STA_DISABLE_HT;
		case NL80211_CHAN_WIDTH_20:
		sta_flags \|= IEEE80211_STA_DISABLE_40MHZ;
		break;
		default:
		break;
		}

		memset(&params, 0, sizeof(params));
		memset(&csa_ie, 0, sizeof(csa_ie));
		err = ieee80211_parse_ch_switch_ie(sdata, elems, beacon, band,
		sta_flags, sdata->vif.addr,
		&csa_ie);
		if (err < 0)
		return false;
		if (err)
		return false;

		params.chandef = csa_ie.chandef;
		params.count = csa_ie.count;

		if (sdata->vif.bss_conf.chandef.chan->band !=
		params.chandef.chan->band)
		return false;

		if (!cfg80211_chandef_usable(sdata->local->hw.wiphy, &params.chandef,
		IEEE80211_CHAN_DISABLED)) {
		sdata_info(sdata,
		"mesh STA %pM switches to unsupported channel (%d MHz, width:%d, CF1/2: %d/%d MHz), aborting\n",
		sdata->vif.addr,
		params.chandef.chan->center_freq,
		params.chandef.width,
		params.chandef.center_freq1,
		params.chandef.center_freq2);
		return false;
		}

		err = cfg80211_chandef_dfs_required(sdata->local->hw.wiphy,
		&params.chandef);
		if (err < 0)
		return false;
		if (err) {
		params.radar_required = true;
		/* TODO: DFS not (yet) supported */
		return false;
		}

		rcu_read_lock();
		chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
		if (!chanctx_conf)
		goto failed_chswitch;

		/* don't handle for multi-VIF cases */
		chanctx = container_of(chanctx_conf, struct ieee80211_chanctx, conf);
		if (chanctx->refcount > 1)
		goto failed_chswitch;

		num_chanctx = 0;
		list_for_each_entry_rcu(chanctx, &sdata->local->chanctx_list, list)
		num_chanctx++;

		if (num_chanctx > 1)
		goto failed_chswitch;

		rcu_read_unlock();

		mcsa_dbg(sdata,
		"received channel switch announcement to go to channel %d MHz\n",
		params.chandef.chan->center_freq);

		params.block_tx = csa_ie.mode & WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT;
		if (beacon)
		ifmsh->chsw_ttl = csa_ie.ttl - 1;
		else
		ifmsh->chsw_ttl = 0;

		if (ifmsh->chsw_ttl > 0)
		if (ieee80211_mesh_csa_beacon(sdata, &params, false) < 0)
		return false;

		sdata->csa_radar_required = params.radar_required;

		if (params.block_tx)
		ieee80211_stop_queues_by_reason(&sdata->local->hw,
		IEEE80211_MAX_QUEUE_MAP,
		IEEE80211_QUEUE_STOP_REASON_CSA);

		sdata->local->csa_chandef = params.chandef;
		sdata->vif.csa_active = true;

		ieee80211_bss_info_change_notify(sdata, err);
		drv_channel_switch_beacon(sdata, &params.chandef);

		return true;
		failed_chswitch:
		rcu_read_unlock();
		return false;
		}

		static void
		ieee80211_mesh_rx_probe_req(struct ieee80211_sub_if_data *sdata,
		struct ieee80211_mgmt *mgmt, size_t len)
		@@ -956,6 +1077,9 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
		if (ifmsh->sync_ops)
		ifmsh->sync_ops->rx_bcn_presp(sdata,
		stype, mgmt, &elems, rx_status);

		if (!ifmsh->chsw_init)
		ieee80211_mesh_process_chnswitch(sdata, &elems, true);
		}

		int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata)
		@@ -1056,7 +1180,7 @@ static void mesh_rx_csa_frame(struct ieee80211_sub_if_data *sdata,
		struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
		struct ieee802_11_elems elems;
		u16 pre_value;
		bool block_tx, fwd_csa = true;
		bool fwd_csa = true;
		size_t baselen;
		u8 *pos, ttl;

		@@ -1079,19 +1203,16 @@ static void mesh_rx_csa_frame(struct ieee80211_sub_if_data *sdata,

		ifmsh->pre_value = pre_value;

		if (!ieee80211_mesh_process_chnswitch(sdata, &elems, false)) {
		mcsa_dbg(sdata, "Failed to process CSA action frame");
		return;
		}

		/* forward or re-broadcast the CSA frame */
		if (fwd_csa) {
		if (mesh_fwd_csa_frame(sdata, mgmt, len) < 0)
		mcsa_dbg(sdata, "Failed to forward the CSA frame");
		}

		/* block the Tx only after forwarding the CSA frame if required */
		block_tx = elems.mesh_chansw_params_ie->mesh_flags &
		WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT;
		if (block_tx)
		ieee80211_stop_queues_by_reason(&sdata->local->hw,
		IEEE80211_MAX_QUEUE_MAP,
		IEEE80211_QUEUE_STOP_REASON_CSA);
		}

		static void ieee80211_mesh_rx_mgmt_action(struct ieee80211_sub_if_data *sdata,

net/mac80211/spectmgmt.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,12 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata,
		return 1;
		}

		/* Mesh Channel Switch Parameters Element */
		if (elems->mesh_chansw_params_ie) {
		csa_ie->ttl = elems->mesh_chansw_params_ie->mesh_ttl;
		csa_ie->mode = elems->mesh_chansw_params_ie->mesh_flags;
		}

		new_freq = ieee80211_channel_to_frequency(new_chan_no, new_band);
		new_chan = ieee80211_get_channel(sdata->local->hw.wiphy, new_freq);
		if (!new_chan \|\| new_chan->flags & IEEE80211_CHAN_DISABLED) {

Admin message