aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-08 11:44:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-11 15:53:36 -0400
commit491775a50787b9fbb09b5735be3d111c65935f5c (patch)
treed09e49e53ea9913c5077ba591d44a18555fd7d58 /net/mac80211/ieee80211_i.h
parent60f8b39c9406752ea5e0d3bbf5df6f903d61cacf (diff)
mac80211: use sdata pointer for scan interface
Since we now use sdata pointers most of the time, using a netdev pointer here is somewhat artificial, use an sdata pointer instead. Replace a netdev-prefix in a few messages by a wiphy-prefix. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index c68d4df11196..a33bbd1ca2b1 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -636,7 +636,7 @@ struct ieee80211_local {
636 enum { SCAN_SET_CHANNEL, SCAN_SEND_PROBE } scan_state; 636 enum { SCAN_SET_CHANNEL, SCAN_SEND_PROBE } scan_state;
637 unsigned long last_scan_completed; 637 unsigned long last_scan_completed;
638 struct delayed_work scan_work; 638 struct delayed_work scan_work;
639 struct net_device *scan_dev; 639 struct ieee80211_sub_if_data *scan_sdata;
640 struct ieee80211_channel *oper_channel, *scan_channel; 640 struct ieee80211_channel *oper_channel, *scan_channel;
641 u8 scan_ssid[IEEE80211_MAX_SSID_LEN]; 641 u8 scan_ssid[IEEE80211_MAX_SSID_LEN];
642 size_t scan_ssid_len; 642 size_t scan_ssid_len;