diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-01-24 18:44:12 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-31 08:05:33 -0500 |
commit | fdcb786930777231c81f487ab2526d33971a3438 (patch) | |
tree | b6546e1e42449fd0fb2c14981641da62faf7a2a3 /net | |
parent | cd8f7cb4e6dfa4ea08fc250a814240b883ef7911 (diff) |
mac80211: remove assoc data "sent_assoc"
The field is never used, so remove it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 1 | ||||
-rw-r--r-- | net/mac80211/mlme.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 5fba867d9e2e..2f50be7eea09 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -400,7 +400,6 @@ struct ieee80211_mgd_assoc_data { | |||
400 | u8 supp_rates_len; | 400 | u8 supp_rates_len; |
401 | bool wmm, uapsd; | 401 | bool wmm, uapsd; |
402 | bool have_beacon; | 402 | bool have_beacon; |
403 | bool sent_assoc; | ||
404 | bool synced; | 403 | bool synced; |
405 | 404 | ||
406 | u8 ap_ht_param; | 405 | u8 ap_ht_param; |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 5913fb924b12..d79b9cd72fc5 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -2555,7 +2555,6 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, | |||
2555 | 2555 | ||
2556 | ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems); | 2556 | ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems); |
2557 | ifmgd->assoc_data->have_beacon = true; | 2557 | ifmgd->assoc_data->have_beacon = true; |
2558 | ifmgd->assoc_data->sent_assoc = false; | ||
2559 | /* continue assoc process */ | 2558 | /* continue assoc process */ |
2560 | ifmgd->assoc_data->timeout = jiffies; | 2559 | ifmgd->assoc_data->timeout = jiffies; |
2561 | run_again(ifmgd, ifmgd->assoc_data->timeout); | 2560 | run_again(ifmgd, ifmgd->assoc_data->timeout); |
@@ -3967,13 +3966,11 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, | |||
3967 | ifmgd->dtim_period = tim->dtim_period; | 3966 | ifmgd->dtim_period = tim->dtim_period; |
3968 | } | 3967 | } |
3969 | assoc_data->have_beacon = true; | 3968 | assoc_data->have_beacon = true; |
3970 | assoc_data->sent_assoc = false; | ||
3971 | assoc_data->timeout = jiffies; | 3969 | assoc_data->timeout = jiffies; |
3972 | } | 3970 | } |
3973 | rcu_read_unlock(); | 3971 | rcu_read_unlock(); |
3974 | } else { | 3972 | } else { |
3975 | assoc_data->have_beacon = true; | 3973 | assoc_data->have_beacon = true; |
3976 | assoc_data->sent_assoc = false; | ||
3977 | assoc_data->timeout = jiffies; | 3974 | assoc_data->timeout = jiffies; |
3978 | } | 3975 | } |
3979 | run_again(ifmgd, assoc_data->timeout); | 3976 | run_again(ifmgd, assoc_data->timeout); |