aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas_tf/main.c
diff options
context:
space:
mode:
authorKarl Beldan <karl.beldan@rivierawaves.com>2013-03-25 11:26:57 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-03-25 14:19:35 -0400
commit675a0b049abf6edf30f8dd84c5610b6edc2296c8 (patch)
tree164178c576642dc1ec8ae70d9e26a5ec33472d26 /drivers/net/wireless/libertas_tf/main.c
parent219c38674c262378ec411dd8318ebfd199fbce8d (diff)
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: Karl Beldan <karl.beldan@rivierawaves.com> [fix kernel-doc] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/libertas_tf/main.c')
-rw-r--r--drivers/net/wireless/libertas_tf/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index 7001856241e6..088de9d25c39 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -412,9 +412,9 @@ static int lbtf_op_config(struct ieee80211_hw *hw, u32 changed)
412 struct ieee80211_conf *conf = &hw->conf; 412 struct ieee80211_conf *conf = &hw->conf;
413 lbtf_deb_enter(LBTF_DEB_MACOPS); 413 lbtf_deb_enter(LBTF_DEB_MACOPS);
414 414
415 if (conf->channel->center_freq != priv->cur_freq) { 415 if (conf->chandef.chan->center_freq != priv->cur_freq) {
416 priv->cur_freq = conf->channel->center_freq; 416 priv->cur_freq = conf->chandef.chan->center_freq;
417 lbtf_set_channel(priv, conf->channel->hw_value); 417 lbtf_set_channel(priv, conf->chandef.chan->hw_value);
418 } 418 }
419 lbtf_deb_leave(LBTF_DEB_MACOPS); 419 lbtf_deb_leave(LBTF_DEB_MACOPS);
420 return 0; 420 return 0;
@@ -537,7 +537,7 @@ static int lbtf_op_get_survey(struct ieee80211_hw *hw, int idx,
537 if (idx != 0) 537 if (idx != 0)
538 return -ENOENT; 538 return -ENOENT;
539 539
540 survey->channel = conf->channel; 540 survey->channel = conf->chandef.chan;
541 survey->filled = SURVEY_INFO_NOISE_DBM; 541 survey->filled = SURVEY_INFO_NOISE_DBM;
542 survey->noise = priv->noise; 542 survey->noise = priv->noise;
543 543