aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorSimon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>2013-05-16 07:00:36 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-06-18 10:27:25 -0400
commit3aede78aad2a7e39a81b4b0caa771d40254a6787 (patch)
treee913c7366c817c188b5fd8b9979d985333bf3207 /net/mac80211/ieee80211_i.h
parent0418a445838749c51cf1e31a9c7ace6685ae87cd (diff)
mac80211: change IBSS channel state to chandef
This should make some parts cleaner and is also required for handling 5/10 MHz properly. Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Signed-off-by: Mathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 194be3de16dd..1bfc3955005c 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -504,8 +504,7 @@ struct ieee80211_if_ibss {
504 u8 ssid[IEEE80211_MAX_SSID_LEN]; 504 u8 ssid[IEEE80211_MAX_SSID_LEN];
505 u8 ssid_len, ie_len; 505 u8 ssid_len, ie_len;
506 u8 *ie; 506 u8 *ie;
507 struct ieee80211_channel *channel; 507 struct cfg80211_chan_def chandef;
508 enum nl80211_channel_type channel_type;
509 508
510 unsigned long ibss_join_req; 509 unsigned long ibss_join_req;
511 /* probe response/beacon for IBSS */ 510 /* probe response/beacon for IBSS */