summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-01-20 13:55:20 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-02-06 14:48:24 -0500
commit71ec375c75095002f36f083ceb32bbb8725734ae (patch)
treeea090e06295a518881e39e7e48132ddb6232d763 /net
parent89c91caeccf45bbeb86104445125fe1eaec12079 (diff)
downloadlinux-stable-71ec375c75095002f36f083ceb32bbb8725734ae.tar.gz
linux-stable-71ec375c75095002f36f083ceb32bbb8725734ae.tar.bz2
linux-stable-71ec375c75095002f36f083ceb32bbb8725734ae.zip
mac80211: add NOTEXIST station state
This will be used by drivers later if they need to have stations inserted all the time, in mac80211 has no purpose, is never used and sta_state starts out in NONE. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/sta_info.c2
-rw-r--r--net/mac80211/sta_info.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 8e1e361c2232..464bc691644b 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -293,6 +293,8 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
sta->sdata = sdata;
sta->last_rx = jiffies;
+ sta->sta_state = IEEE80211_STA_NONE;
+
do_posix_clock_monotonic_gettime(&uptime);
sta->last_connected = uptime.tv_sec;
ewma_init(&sta->avg_signal, 1024, 8);
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 381de37d2478..da4b03c1c3bc 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -77,6 +77,7 @@ enum ieee80211_sta_info_flags {
enum ieee80211_sta_state {
/* NOTE: These need to be ordered correctly! */
+ IEEE80211_STA_NOTEXIST,
IEEE80211_STA_NONE,
IEEE80211_STA_AUTH,
IEEE80211_STA_ASSOC,