diff options
author | Karl Beldan <karl.beldan@rivierawaves.com> | 2013-03-25 11:26:57 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-25 14:19:35 -0400 |
commit | 675a0b049abf6edf30f8dd84c5610b6edc2296c8 (patch) | |
tree | 164178c576642dc1ec8ae70d9e26a5ec33472d26 /drivers/net/wireless/at76c50x-usb.c | |
parent | 219c38674c262378ec411dd8318ebfd199fbce8d (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/at76c50x-usb.c')
-rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 5ac5f7ae2721..34c8a33cac06 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c | |||
@@ -1943,12 +1943,12 @@ static int at76_config(struct ieee80211_hw *hw, u32 changed) | |||
1943 | struct at76_priv *priv = hw->priv; | 1943 | struct at76_priv *priv = hw->priv; |
1944 | 1944 | ||
1945 | at76_dbg(DBG_MAC80211, "%s(): channel %d", | 1945 | at76_dbg(DBG_MAC80211, "%s(): channel %d", |
1946 | __func__, hw->conf.channel->hw_value); | 1946 | __func__, hw->conf.chandef.chan->hw_value); |
1947 | at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:"); | 1947 | at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:"); |
1948 | 1948 | ||
1949 | mutex_lock(&priv->mtx); | 1949 | mutex_lock(&priv->mtx); |
1950 | 1950 | ||
1951 | priv->channel = hw->conf.channel->hw_value; | 1951 | priv->channel = hw->conf.chandef.chan->hw_value; |
1952 | 1952 | ||
1953 | if (is_valid_ether_addr(priv->bssid)) | 1953 | if (is_valid_ether_addr(priv->bssid)) |
1954 | at76_join(priv); | 1954 | at76_join(priv); |