Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675a0b04 authored by Karl Beldan's avatar Karl Beldan Committed by Johannes Berg
Browse files

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan 



Drivers that don't use chanctxes cannot perform VHT association because
they still use a "backward compatibility" pair of {ieee80211_channel,
nl80211_channel_type} in ieee80211_conf and ieee80211_local.

Signed-off-by: default avatarKarl Beldan <karl.beldan@rivierawaves.com>
[fix kernel-doc]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 219c3867

drivers/net/wireless/adm8211.c

+2 −1
Original line number Diff line number Diff line
@@ -1293,7 +1293,8 @@ static int adm8211_config(struct ieee80211_hw *dev, u32 changed) 
{

	struct adm8211_priv *priv = dev->priv;

	struct ieee80211_conf *conf = &dev->conf;

	int channel = ieee80211_frequency_to_channel(conf->channel->center_freq);

	int channel =

		ieee80211_frequency_to_channel(conf->chandef.chan->center_freq);



	if (channel != priv->channel) {

		priv->channel = channel;

drivers/net/wireless/at76c50x-usb.c

+2 −2
Original line number Diff line number Diff line
@@ -1943,12 +1943,12 @@ static int at76_config(struct ieee80211_hw *hw, u32 changed) 
	struct at76_priv *priv = hw->priv;



	at76_dbg(DBG_MAC80211, "%s(): channel %d",

		 __func__, hw->conf.channel->hw_value);

		 __func__, hw->conf.chandef.chan->hw_value);

	at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:");



	mutex_lock(&priv->mtx);



	priv->channel = hw->conf.channel->hw_value;

	priv->channel = hw->conf.chandef.chan->hw_value;



	if (is_valid_ether_addr(priv->bssid))

		at76_join(priv);

drivers/net/wireless/ath/ar5523/ar5523.c

+7 −7
Original line number Diff line number Diff line
@@ -457,14 +457,14 @@ static int ar5523_set_chan(struct ar5523 *ar) 
	memset(&reset, 0, sizeof(reset));

	reset.flags |= cpu_to_be32(UATH_CHAN_2GHZ);

	reset.flags |= cpu_to_be32(UATH_CHAN_OFDM);

	reset.freq = cpu_to_be32(conf->channel->center_freq);

	reset.freq = cpu_to_be32(conf->chandef.chan->center_freq);

	reset.maxrdpower = cpu_to_be32(50);	/* XXX */

	reset.channelchange = cpu_to_be32(1);

	reset.keeprccontent = cpu_to_be32(0);



	ar5523_dbg(ar, "set chan flags 0x%x freq %d\n",

		   be32_to_cpu(reset.flags),

		   conf->channel->center_freq);

		   conf->chandef.chan->center_freq);

	return ar5523_cmd_write(ar, WDCMSG_RESET, &reset, sizeof(reset), 0);

}
@@ -594,7 +594,7 @@ static void ar5523_data_rx_cb(struct urb *urb) 
	rx_status = IEEE80211_SKB_RXCB(data->skb);

	memset(rx_status, 0, sizeof(*rx_status));

	rx_status->freq = be32_to_cpu(desc->channel);

	rx_status->band = hw->conf.channel->band;

	rx_status->band = hw->conf.chandef.chan->band;

	rx_status->signal = -95 + be32_to_cpu(desc->rssi);



	ieee80211_rx_irqsafe(hw, data->skb);
@@ -1153,13 +1153,13 @@ static int ar5523_get_wlan_mode(struct ar5523 *ar, 
	struct ieee80211_sta *sta;

	u32 sta_rate_set;



	band = ar->hw->wiphy->bands[ar->hw->conf.channel->band];

	band = ar->hw->wiphy->bands[ar->hw->conf.chandef.chan->band];

	sta = ieee80211_find_sta(ar->vif, bss_conf->bssid);

	if (!sta) {

		ar5523_info(ar, "STA not found!\n");

		return WLAN_MODE_11b;

	}

	sta_rate_set = sta->supp_rates[ar->hw->conf.channel->band];

	sta_rate_set = sta->supp_rates[ar->hw->conf.chandef.chan->band];



	for (bit = 0; bit < band->n_bitrates; bit++) {

		if (sta_rate_set & 1) {
@@ -1197,11 +1197,11 @@ static void ar5523_create_rateset(struct ar5523 *ar, 
		ar5523_info(ar, "STA not found. Cannot set rates\n");

		sta_rate_set = bss_conf->basic_rates;

	} else

		sta_rate_set = sta->supp_rates[ar->hw->conf.channel->band];

		sta_rate_set = sta->supp_rates[ar->hw->conf.chandef.chan->band];



	ar5523_dbg(ar, "sta rate_set = %08x\n", sta_rate_set);



	band = ar->hw->wiphy->bands[ar->hw->conf.channel->band];

	band = ar->hw->wiphy->bands[ar->hw->conf.chandef.chan->band];

	for (bit = 0; bit < band->n_bitrates; bit++) {

		BUG_ON(i >= AR5523_MAX_NRATES);

		ar5523_dbg(ar, "Considering rate %d : %d\n",

drivers/net/wireless/ath/ath5k/base.c

+1 −1
Original line number Diff line number Diff line
@@ -2639,7 +2639,7 @@ int ath5k_start(struct ieee80211_hw *hw) 
	 * be followed by initialization of the appropriate bits

	 * and then setup of the interrupt mask.

	 */

	ah->curchan = ah->hw->conf.channel;

	ah->curchan = ah->hw->conf.chandef.chan;

	ah->imask = AR5K_INT_RXOK

		| AR5K_INT_RXERR

		| AR5K_INT_RXEOL

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ ath5k_config(struct ieee80211_hw *hw, u32 changed) 
	mutex_lock(&ah->lock);



	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {

		ret = ath5k_chan_set(ah, conf->channel);

		ret = ath5k_chan_set(ah, conf->chandef.chan);

		if (ret < 0)

			goto unlock;

	}
@@ -678,7 +678,7 @@ ath5k_get_survey(struct ieee80211_hw *hw, int idx, struct survey_info *survey) 


	memcpy(survey, &ah->survey, sizeof(*survey));



	survey->channel = conf->channel;

	survey->channel = conf->chandef.chan;

	survey->noise = ah->ah_noise_floor;

	survey->filled = SURVEY_INFO_NOISE_DBM |

			SURVEY_INFO_CHANNEL_TIME |