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 /net/mac80211/ieee80211_i.h | |
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 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index c7f8b8b29e58..f9782f0f4348 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -1021,8 +1021,7 @@ struct ieee80211_local { | |||
1021 | struct ieee80211_sub_if_data __rcu *scan_sdata; | 1021 | struct ieee80211_sub_if_data __rcu *scan_sdata; |
1022 | struct ieee80211_channel *csa_channel; | 1022 | struct ieee80211_channel *csa_channel; |
1023 | /* For backward compatibility only -- do not use */ | 1023 | /* For backward compatibility only -- do not use */ |
1024 | struct ieee80211_channel *_oper_channel; | 1024 | struct cfg80211_chan_def _oper_chandef; |
1025 | enum nl80211_channel_type _oper_channel_type; | ||
1026 | 1025 | ||
1027 | /* Temporary remain-on-channel for off-channel operations */ | 1026 | /* Temporary remain-on-channel for off-channel operations */ |
1028 | struct ieee80211_channel *tmp_channel; | 1027 | struct ieee80211_channel *tmp_channel; |