Commit 4bf88530 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: convert to channel definition struct 



Convert mac80211 (and where necessary, some drivers a
little bit) to the new channel definition struct.

This will allow extending mac80211 for VHT, which is
currently restricted to channel contexts since there
are no drivers using that which makes it easier. As
I also don't care about VHT for drivers not using the
channel context API, I won't convert the previous API
to VHT support.

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

drivers/net/wireless/mac80211_hwsim.c

+19 −14
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static void mac80211_hwsim_tx_iter(void *_data, u8 *addr, 
		return;



	if (!hwsim_chans_compat(data->channel,

				rcu_dereference(vif->chanctx_conf)->channel))

				rcu_dereference(vif->chanctx_conf)->def.chan))

		return;



	data->receive = true;
@@ -832,7 +832,7 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, 
	} else {

		chanctx_conf = rcu_dereference(txi->control.vif->chanctx_conf);

		if (chanctx_conf)

			channel = chanctx_conf->channel;

			channel = chanctx_conf->def.chan;

		else

			channel = NULL;

	}
@@ -977,7 +977,7 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac, 
		return;



	mac80211_hwsim_tx_frame(hw, skb,

				rcu_dereference(vif->chanctx_conf)->channel);

				rcu_dereference(vif->chanctx_conf)->def.chan);

}
@@ -1107,9 +1107,8 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw, 
	}



	if (changed & BSS_CHANGED_HT) {

		wiphy_debug(hw->wiphy, "  HT: op_mode=0x%x, chantype=%s\n",

			    info->ht_operation_mode,

			    hwsim_chantypes[info->channel_type]);

		wiphy_debug(hw->wiphy, "  HT: op_mode=0x%x\n",

			    info->ht_operation_mode);

	}



	if (changed & BSS_CHANGED_BASIC_RATES) {
@@ -1497,16 +1496,20 @@ static int mac80211_hwsim_add_chanctx(struct ieee80211_hw *hw, 
				      struct ieee80211_chanctx_conf *ctx)

{

	hwsim_set_chanctx_magic(ctx);

	wiphy_debug(hw->wiphy, "add channel context %d MHz/%d\n",

		    ctx->channel->center_freq, ctx->channel_type);

	wiphy_debug(hw->wiphy,

		    "add channel context control: %d MHz/width: %d/cfreqs:%d/%d MHz\n",

		    ctx->def.chan->center_freq, ctx->def.width,

		    ctx->def.center_freq1, ctx->def.center_freq2);

	return 0;

}



static void mac80211_hwsim_remove_chanctx(struct ieee80211_hw *hw,

					  struct ieee80211_chanctx_conf *ctx)

{

	wiphy_debug(hw->wiphy, "remove channel context %d MHz/%d\n",

		    ctx->channel->center_freq, ctx->channel_type);

	wiphy_debug(hw->wiphy,

		    "remove channel context control: %d MHz/width: %d/cfreqs:%d/%d MHz\n",

		    ctx->def.chan->center_freq, ctx->def.width,

		    ctx->def.center_freq1, ctx->def.center_freq2);

	hwsim_check_chanctx_magic(ctx);

	hwsim_clear_chanctx_magic(ctx);

}
@@ -1516,8 +1519,10 @@ static void mac80211_hwsim_change_chanctx(struct ieee80211_hw *hw, 
					  u32 changed)

{

	hwsim_check_chanctx_magic(ctx);

	wiphy_debug(hw->wiphy, "change channel context %#x (%d MHz/%d)\n",

		    changed, ctx->channel->center_freq, ctx->channel_type);

	wiphy_debug(hw->wiphy,

		    "change channel context control: %d MHz/width: %d/cfreqs:%d/%d MHz\n",

		    ctx->def.chan->center_freq, ctx->def.width,

		    ctx->def.center_freq1, ctx->def.center_freq2);

}



static int mac80211_hwsim_assign_vif_chanctx(struct ieee80211_hw *hw,
@@ -1639,7 +1644,7 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif) 


	rcu_read_lock();

	mac80211_hwsim_tx_frame(data->hw, skb,

				rcu_dereference(vif->chanctx_conf)->channel);

				rcu_dereference(vif->chanctx_conf)->def.chan);

	rcu_read_unlock();

}
@@ -1671,7 +1676,7 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac, 


	rcu_read_lock();

	mac80211_hwsim_tx_frame(data->hw, skb,

				rcu_dereference(vif->chanctx_conf)->channel);

				rcu_dereference(vif->chanctx_conf)->def.chan);

	rcu_read_unlock();

}

drivers/net/wireless/ti/wlcore/main.c

+5 −4
Original line number Diff line number Diff line
@@ -3791,7 +3791,7 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl, 


	/* Handle HT information change */

	if ((changed & BSS_CHANGED_HT) &&

	    (bss_conf->channel_type != NL80211_CHAN_NO_HT)) {

	    (bss_conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT)) {

		ret = wl1271_acx_set_ht_information(wl, wlvif,

					bss_conf->ht_operation_mode);

		if (ret < 0) {
@@ -3905,7 +3905,8 @@ sta_not_found: 
			u32 rates;

			int ieoffset;

			wlvif->aid = bss_conf->aid;

			wlvif->channel_type = bss_conf->channel_type;

			wlvif->channel_type =

				cfg80211_get_chandef_type(&bss_conf->chandef);

			wlvif->beacon_int = bss_conf->beacon_int;

			do_join = true;

			set_assoc = true;
@@ -4071,7 +4072,7 @@ sta_not_found: 
	/* Handle new association with HT. Do this after join. */

	if (sta_exists) {

		if ((changed & BSS_CHANGED_HT) &&

		    (bss_conf->channel_type != NL80211_CHAN_NO_HT)) {

		    (bss_conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT)) {

			ret = wl1271_acx_set_ht_capabilities(wl,

							     &sta_ht_cap,

							     true,
@@ -4098,7 +4099,7 @@ sta_not_found: 


	/* Handle HT information change. Done after join. */

	if ((changed & BSS_CHANGED_HT) &&

	    (bss_conf->channel_type != NL80211_CHAN_NO_HT)) {

	    (bss_conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT)) {

		ret = wl1271_acx_set_ht_information(wl, wlvif,

					bss_conf->ht_operation_mode);

		if (ret < 0) {

include/net/mac80211.h

+7 −10
Original line number Diff line number Diff line
@@ -145,11 +145,11 @@ struct ieee80211_low_level_stats { 


/**

 * enum ieee80211_chanctx_change - change flag for channel context

 * @IEEE80211_CHANCTX_CHANGE_CHANNEL_TYPE: The channel type was changed

 * @IEEE80211_CHANCTX_CHANGE_WIDTH: The channel width changed

 * @IEEE80211_CHANCTX_CHANGE_RX_CHAINS: The number of RX chains changed

 */

enum ieee80211_chanctx_change {

	IEEE80211_CHANCTX_CHANGE_CHANNEL_TYPE	= BIT(0),

	IEEE80211_CHANCTX_CHANGE_WIDTH		= BIT(0),

	IEEE80211_CHANCTX_CHANGE_RX_CHAINS	= BIT(1),

};
@@ -159,8 +159,7 @@ enum ieee80211_chanctx_change { 
 * This is the driver-visible part. The ieee80211_chanctx

 * that contains it is visible in mac80211 only.

 *

 * @channel: the channel to tune to

 * @channel_type: the channel (HT) type

 * @def: the channel definition

 * @rx_chains_static: The number of RX chains that must always be

 *	active on the channel to receive MIMO transmissions

 * @rx_chains_dynamic: The number of RX chains that must be enabled
@@ -170,8 +169,7 @@ enum ieee80211_chanctx_change { 
 *	sizeof(void *), size is determined in hw information.

 */

struct ieee80211_chanctx_conf {

	struct ieee80211_channel *channel;

	enum nl80211_channel_type channel_type;

	struct cfg80211_chan_def def;



	u8 rx_chains_static, rx_chains_dynamic;
@@ -288,9 +286,8 @@ enum ieee80211_rssi_event { 
 * @mcast_rate: per-band multicast rate index + 1 (0: disabled)

 * @bssid: The BSSID for this BSS

 * @enable_beacon: whether beaconing should be enabled or not

 * @channel_type: Channel type for this BSS -- the hardware might be

 *	configured for HT40+ while this BSS only uses no-HT, for

 *	example.

 * @chandef: Channel definition for this BSS -- the hardware might be

 *	configured a higher bandwidth than this BSS uses, for example.

 * @ht_operation_mode: HT operation mode like in &struct ieee80211_ht_operation.

 *	This field is only valid when the channel type is one of the HT types.

 * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero value
@@ -339,7 +336,7 @@ struct ieee80211_bss_conf { 
	u16 ht_operation_mode;

	s32 cqm_rssi_thold;

	u32 cqm_rssi_hyst;

	enum nl80211_channel_type channel_type;

	struct cfg80211_chan_def chandef;

	__be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN];

	u8 arp_addr_cnt;

	bool arp_filter_enabled;

net/mac80211/cfg.c

+14 −27
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ do_survey: 
	rcu_read_lock();

	chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);

	if (chanctx_conf)

		channel = chanctx_conf->channel;

		channel = chanctx_conf->def.chan;

	else

		channel = NULL;

	rcu_read_unlock();
@@ -739,13 +739,9 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy, 
{

	struct ieee80211_local *local = wiphy_priv(wiphy);

	struct ieee80211_sub_if_data *sdata;

	enum nl80211_channel_type channel_type;

	int ret = 0;



	channel_type = cfg80211_get_chandef_type(chandef);



	if (local->monitor_channel == chandef->chan &&

	    local->monitor_channel_type == channel_type)

	if (cfg80211_chandef_identical(&local->monitor_chandef, chandef))

		return 0;



	mutex_lock(&local->iflist_mtx);
@@ -755,20 +751,17 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy, 
				lockdep_is_held(&local->iflist_mtx));

		if (sdata) {

			ieee80211_vif_release_channel(sdata);

			ret = ieee80211_vif_use_channel(

					sdata, chandef->chan, channel_type,

			ret = ieee80211_vif_use_channel(sdata, chandef,

					IEEE80211_CHANCTX_EXCLUSIVE);

		}

	} else if (local->open_count == local->monitors) {

		local->_oper_channel = chandef->chan;

		local->_oper_channel_type = channel_type;

		local->_oper_channel_type = cfg80211_get_chandef_type(chandef);

		ieee80211_hw_config(local, 0);

	}



	if (ret == 0) {

		local->monitor_channel = chandef->chan;

		local->monitor_channel_type = channel_type;

	}

	if (ret == 0)

		local->monitor_chandef = *chandef;

	mutex_unlock(&local->iflist_mtx);



	return ret;
@@ -890,9 +883,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	sdata->smps_mode = IEEE80211_SMPS_OFF;

	sdata->needed_rx_chains = sdata->local->rx_chains;



	err = ieee80211_vif_use_channel(

		sdata, params->chandef.chan,

		cfg80211_get_chandef_type(&params->chandef),

	err = ieee80211_vif_use_channel(sdata, &params->chandef,

					IEEE80211_CHANCTX_SHARED);

	if (err)

		return err;
@@ -1710,9 +1701,7 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev, 
	sdata->smps_mode = IEEE80211_SMPS_OFF;

	sdata->needed_rx_chains = sdata->local->rx_chains;



	err = ieee80211_vif_use_channel(

		sdata, setup->chandef.chan,

		cfg80211_get_chandef_type(&setup->chandef),

	err = ieee80211_vif_use_channel(sdata, &setup->chandef,

					IEEE80211_CHANCTX_SHARED);

	if (err)

		return err;
@@ -2133,7 +2122,7 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata, 
	 * the new value until we associate.

	 */

	if (!sdata->u.mgd.associated ||

	    sdata->vif.bss_conf.channel_type == NL80211_CHAN_NO_HT)

	    sdata->vif.bss_conf.chandef.width == NL80211_CHAN_WIDTH_20_NOHT)

		return 0;



	ap = sdata->u.mgd.associated->bssid;
@@ -2589,7 +2578,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
		chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);



		if (chanctx_conf)

			need_offchan = chan != chanctx_conf->channel;

			need_offchan = chan != chanctx_conf->def.chan;

		else

			need_offchan = true;

		rcu_read_unlock();
@@ -3057,7 +3046,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, 
		rcu_read_unlock();

		return -EINVAL;

	}

	band = chanctx_conf->channel->band;

	band = chanctx_conf->def.chan->band;

	sta = sta_info_get(sdata, peer);

	if (sta) {

		qos = test_sta_flag(sta, WLAN_STA_WME);
@@ -3125,9 +3114,7 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy, 
	rcu_read_lock();

	chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);

	if (chanctx_conf) {

		cfg80211_chandef_create(chandef,

					chanctx_conf->channel,

					chanctx_conf->channel_type);

		*chandef = chanctx_conf->def;

		ret = 0;

	}

	rcu_read_unlock();

net/mac80211/chan.c

+38 −90
Original line number Diff line number Diff line
@@ -8,93 +8,47 @@ 
#include "ieee80211_i.h"

#include "driver-ops.h"



static bool

ieee80211_channel_types_are_compatible(enum nl80211_channel_type chantype1,

				       enum nl80211_channel_type chantype2,

				       enum nl80211_channel_type *compat)

{

	/*

	 * start out with chantype1 being the result,

	 * overwriting later if needed

	 */

	if (compat)

		*compat = chantype1;



	switch (chantype1) {

	case NL80211_CHAN_NO_HT:

		if (compat)

			*compat = chantype2;

		break;

	case NL80211_CHAN_HT20:

		/*

		 * allow any change that doesn't go to no-HT

		 * (if it already is no-HT no change is needed)

		 */

		if (chantype2 == NL80211_CHAN_NO_HT)

			break;

		if (compat)

			*compat = chantype2;

		break;

	case NL80211_CHAN_HT40PLUS:

	case NL80211_CHAN_HT40MINUS:

		/* allow smaller bandwidth and same */

		if (chantype2 == NL80211_CHAN_NO_HT)

			break;

		if (chantype2 == NL80211_CHAN_HT20)

			break;

		if (chantype2 == chantype1)

			break;

		return false;

	}



	return true;

}



static void ieee80211_change_chantype(struct ieee80211_local *local,

static void ieee80211_change_chandef(struct ieee80211_local *local,

				     struct ieee80211_chanctx *ctx,

				      enum nl80211_channel_type chantype)

				     const struct cfg80211_chan_def *chandef)

{

	if (chantype == ctx->conf.channel_type)

	if (cfg80211_chandef_identical(&ctx->conf.def, chandef))

		return;



	ctx->conf.channel_type = chantype;

	drv_change_chanctx(local, ctx, IEEE80211_CHANCTX_CHANGE_CHANNEL_TYPE);

	WARN_ON(!cfg80211_chandef_compatible(&ctx->conf.def, chandef));



	ctx->conf.def = *chandef;

	drv_change_chanctx(local, ctx, IEEE80211_CHANCTX_CHANGE_WIDTH);



	if (!local->use_chanctx) {

		local->_oper_channel_type = chantype;

		local->_oper_channel_type = cfg80211_get_chandef_type(chandef);

		ieee80211_hw_config(local, 0);

	}

}



static struct ieee80211_chanctx *

ieee80211_find_chanctx(struct ieee80211_local *local,

		       struct ieee80211_channel *channel,

		       enum nl80211_channel_type channel_type,

		       const struct cfg80211_chan_def *chandef,

		       enum ieee80211_chanctx_mode mode)

{

	struct ieee80211_chanctx *ctx;

	enum nl80211_channel_type compat_type;



	lockdep_assert_held(&local->chanctx_mtx);



	if (mode == IEEE80211_CHANCTX_EXCLUSIVE)

		return NULL;

	if (WARN_ON(!channel))

		return NULL;



	list_for_each_entry(ctx, &local->chanctx_list, list) {

		compat_type = ctx->conf.channel_type;

		const struct cfg80211_chan_def *compat;



		if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE)

			continue;

		if (ctx->conf.channel != channel)

			continue;

		if (!ieee80211_channel_types_are_compatible(ctx->conf.channel_type,

							    channel_type,

							    &compat_type))



		compat = cfg80211_chandef_compatible(&ctx->conf.def, chandef);

		if (!compat)

			continue;



		ieee80211_change_chantype(local, ctx, compat_type);

		ieee80211_change_chandef(local, ctx, compat);



		return ctx;

	}
@@ -104,8 +58,7 @@ ieee80211_find_chanctx(struct ieee80211_local *local, 


static struct ieee80211_chanctx *

ieee80211_new_chanctx(struct ieee80211_local *local,

		      struct ieee80211_channel *channel,

		      enum nl80211_channel_type channel_type,

		      const struct cfg80211_chan_def *chandef,

		      enum ieee80211_chanctx_mode mode)

{

	struct ieee80211_chanctx *ctx;
@@ -117,15 +70,15 @@ ieee80211_new_chanctx(struct ieee80211_local *local, 
	if (!ctx)

		return ERR_PTR(-ENOMEM);



	ctx->conf.channel = channel;

	ctx->conf.channel_type = channel_type;

	ctx->conf.def = *chandef;

	ctx->conf.rx_chains_static = 1;

	ctx->conf.rx_chains_dynamic = 1;

	ctx->mode = mode;



	if (!local->use_chanctx) {

		local->_oper_channel_type = channel_type;

		local->_oper_channel = channel;

		local->_oper_channel_type =

			cfg80211_get_chandef_type(chandef);

		local->_oper_channel = chandef->chan;

		ieee80211_hw_config(local, 0);

	} else {

		err = drv_add_chanctx(local, ctx);
@@ -178,41 +131,37 @@ static int ieee80211_assign_vif_chanctx(struct ieee80211_sub_if_data *sdata, 
	return 0;

}



static enum nl80211_channel_type

ieee80211_calc_chantype(struct ieee80211_local *local,

static void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local,

					      struct ieee80211_chanctx *ctx)

{

	struct ieee80211_chanctx_conf *conf = &ctx->conf;

	struct ieee80211_sub_if_data *sdata;

	enum nl80211_channel_type result = NL80211_CHAN_NO_HT;

	const struct cfg80211_chan_def *compat = NULL;



	lockdep_assert_held(&local->chanctx_mtx);



	rcu_read_lock();

	list_for_each_entry_rcu(sdata, &local->interfaces, list) {



		if (!ieee80211_sdata_running(sdata))

			continue;

		if (rcu_access_pointer(sdata->vif.chanctx_conf) != conf)

			continue;



		WARN_ON_ONCE(!ieee80211_channel_types_are_compatible(

					sdata->vif.bss_conf.channel_type,

					result, &result));

	}

	rcu_read_unlock();

		if (!compat)

			compat = &sdata->vif.bss_conf.chandef;



	return result;

		compat = cfg80211_chandef_compatible(

				&sdata->vif.bss_conf.chandef, compat);

		if (!compat)

			break;

	}

	rcu_read_unlock();



static void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local,

					      struct ieee80211_chanctx *ctx)

{

	enum nl80211_channel_type chantype;



	lockdep_assert_held(&local->chanctx_mtx);

	if (WARN_ON_ONCE(!compat))

		return;



	chantype = ieee80211_calc_chantype(local, ctx);

	ieee80211_change_chantype(local, ctx, chantype);

	ieee80211_change_chandef(local, ctx, compat);

}



static void ieee80211_unassign_vif_chanctx(struct ieee80211_sub_if_data *sdata,
@@ -337,8 +286,7 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local, 
}



int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata,

			      struct ieee80211_channel *channel,

			      enum nl80211_channel_type channel_type,

			      const struct cfg80211_chan_def *chandef,

			      enum ieee80211_chanctx_mode mode)

{

	struct ieee80211_local *local = sdata->local;
@@ -350,15 +298,15 @@ int ieee80211_vif_use_channel(struct ieee80211_sub_if_data *sdata, 
	mutex_lock(&local->chanctx_mtx);

	__ieee80211_vif_release_channel(sdata);



	ctx = ieee80211_find_chanctx(local, channel, channel_type, mode);

	ctx = ieee80211_find_chanctx(local, chandef, mode);

	if (!ctx)

		ctx = ieee80211_new_chanctx(local, channel, channel_type, mode);

		ctx = ieee80211_new_chanctx(local, chandef, mode);

	if (IS_ERR(ctx)) {

		ret = PTR_ERR(ctx);

		goto out;

	}



	sdata->vif.bss_conf.channel_type = channel_type;

	sdata->vif.bss_conf.chandef = *chandef;



	ret = ieee80211_assign_vif_chanctx(sdata, ctx);

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE