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

Commit 0671894f authored by Simon Wunderlich's avatar Simon Wunderlich Committed by John W. Linville
Browse files

ath9k: use chandef instead of channel_type 



To enable support for 5/10 MHz, some internal functions must be
converted from using the (old) channel_type to chandef. This is a good
chance to change all remaining occurences.

Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarMathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 92367fe7

drivers/net/wireless/ath/ath9k/common.c

+41 −26
Original line number Diff line number Diff line
@@ -49,38 +49,41 @@ int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb) 
}

EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_keytype);



static u32 ath9k_get_extchanmode(struct ieee80211_channel *chan,

				 enum nl80211_channel_type channel_type)

static u32 ath9k_get_extchanmode(struct cfg80211_chan_def *chandef)

{

	u32 chanmode = 0;



	switch (chan->band) {

	switch (chandef->chan->band) {

	case IEEE80211_BAND_2GHZ:

		switch (channel_type) {

		case NL80211_CHAN_NO_HT:

		case NL80211_CHAN_HT20:

		switch (chandef->width) {

		case NL80211_CHAN_WIDTH_20_NOHT:

		case NL80211_CHAN_WIDTH_20:

			chanmode = CHANNEL_G_HT20;

			break;

		case NL80211_CHAN_HT40PLUS:

		case NL80211_CHAN_WIDTH_40:

			if (chandef->center_freq1 > chandef->chan->center_freq)

				chanmode = CHANNEL_G_HT40PLUS;

			break;

		case NL80211_CHAN_HT40MINUS:

			else

				chanmode = CHANNEL_G_HT40MINUS;

			break;

		default:

			break;

		}

		break;

	case IEEE80211_BAND_5GHZ:

		switch (channel_type) {

		case NL80211_CHAN_NO_HT:

		case NL80211_CHAN_HT20:

		switch (chandef->width) {

		case NL80211_CHAN_WIDTH_20_NOHT:

		case NL80211_CHAN_WIDTH_20:

			chanmode = CHANNEL_A_HT20;

			break;

		case NL80211_CHAN_HT40PLUS:

		case NL80211_CHAN_WIDTH_40:

			if (chandef->center_freq1 > chandef->chan->center_freq)

				chanmode = CHANNEL_A_HT40PLUS;

			break;

		case NL80211_CHAN_HT40MINUS:

			else

				chanmode = CHANNEL_A_HT40MINUS;

			break;

		default:

			break;

		}

		break;

	default:
@@ -94,13 +97,12 @@ static u32 ath9k_get_extchanmode(struct ieee80211_channel *chan, 
 * Update internal channel flags.

 */

void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,

			       struct ieee80211_channel *chan,

			       enum nl80211_channel_type channel_type)

			       struct cfg80211_chan_def *chandef)

{

	ichan->channel = chan->center_freq;

	ichan->chan = chan;

	ichan->channel = chandef->chan->center_freq;

	ichan->chan = chandef->chan;



	if (chan->band == IEEE80211_BAND_2GHZ) {

	if (chandef->chan->band == IEEE80211_BAND_2GHZ) {

		ichan->chanmode = CHANNEL_G;

		ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM;

	} else {
@@ -108,8 +110,22 @@ void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan, 
		ichan->channelFlags = CHANNEL_5GHZ | CHANNEL_OFDM;

	}



	if (channel_type != NL80211_CHAN_NO_HT)

		ichan->chanmode = ath9k_get_extchanmode(chan, channel_type);

	switch (chandef->width) {

	case NL80211_CHAN_WIDTH_5:

		ichan->channelFlags |= CHANNEL_QUARTER;

		break;

	case NL80211_CHAN_WIDTH_10:

		ichan->channelFlags |= CHANNEL_HALF;

		break;

	case NL80211_CHAN_WIDTH_20_NOHT:

		break;

	case NL80211_CHAN_WIDTH_20:

	case NL80211_CHAN_WIDTH_40:

		ichan->chanmode = ath9k_get_extchanmode(chandef);

		break;

	default:

		WARN_ON(1);

	}

}

EXPORT_SYMBOL(ath9k_cmn_update_ichannel);
@@ -125,8 +141,7 @@ struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw, 


	chan_idx = curchan->hw_value;

	channel = &ah->channels[chan_idx];

	ath9k_cmn_update_ichannel(channel, curchan,

				  cfg80211_get_chandef_type(&hw->conf.chandef));

	ath9k_cmn_update_ichannel(channel, &hw->conf.chandef);



	return channel;

}

drivers/net/wireless/ath/ath9k/common.h

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ 


int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);

void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,

			       struct ieee80211_channel *chan,

			       enum nl80211_channel_type channel_type);

			       struct cfg80211_chan_def *chandef);

struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,

					       struct ath_hw *ah);

int ath9k_cmn_count_streams(unsigned int chainmask, int max);

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+1 −4
Original line number Diff line number Diff line
@@ -1203,16 +1203,13 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed) 


	if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || chip_reset) {

		struct ieee80211_channel *curchan = hw->conf.chandef.chan;

		enum nl80211_channel_type channel_type =

			cfg80211_get_chandef_type(&hw->conf.chandef);

		int pos = curchan->hw_value;



		ath_dbg(common, CONFIG, "Set channel: %d MHz\n",

			curchan->center_freq);



		ath9k_cmn_update_ichannel(&priv->ah->channels[pos],

					  hw->conf.chandef.chan,

					  channel_type);

					  &hw->conf.chandef);



		if (ath9k_htc_set_channel(priv, hw, &priv->ah->channels[pos]) < 0) {

			ath_err(common, "Unable to set channel\n");

drivers/net/wireless/ath/ath9k/init.c

+3 −1
Original line number Diff line number Diff line
@@ -726,13 +726,15 @@ static void ath9k_init_band_txpower(struct ath_softc *sc, int band) 
	struct ieee80211_supported_band *sband;

	struct ieee80211_channel *chan;

	struct ath_hw *ah = sc->sc_ah;

	struct cfg80211_chan_def chandef;

	int i;



	sband = &sc->sbands[band];

	for (i = 0; i < sband->n_channels; i++) {

		chan = &sband->channels[i];

		ah->curchan = &ah->channels[chan->hw_value];

		ath9k_cmn_update_ichannel(ah->curchan, chan, NL80211_CHAN_HT20);

		cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_HT20);

		ath9k_cmn_update_ichannel(ah->curchan, &chandef);

		ath9k_hw_set_txpowerlimit(ah, MAX_RATE_POWER, true);

	}

}

drivers/net/wireless/ath/ath9k/main.c

+3 −5
Original line number Diff line number Diff line
@@ -1201,8 +1201,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 


	if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {

		struct ieee80211_channel *curchan = hw->conf.chandef.chan;

		enum nl80211_channel_type channel_type =

			cfg80211_get_chandef_type(&conf->chandef);

		int pos = curchan->hw_value;

		int old_pos = -1;

		unsigned long flags;
@@ -1210,8 +1208,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
		if (ah->curchan)

			old_pos = ah->curchan - &ah->channels[0];



		ath_dbg(common, CONFIG, "Set channel: %d MHz type: %d\n",

			curchan->center_freq, channel_type);

		ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",

			curchan->center_freq, hw->conf.chandef.width);



		/* update survey stats for the old channel before switching */

		spin_lock_irqsave(&common->cc_lock, flags);
@@ -1219,7 +1217,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
		spin_unlock_irqrestore(&common->cc_lock, flags);



		ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],

					  curchan, channel_type);

					  &conf->chandef);



		/*

		 * If the operating channel changes, change the survey in-use flags