From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 24 Jan 2013 23:44:12 +0000 (+0100)
Subject: mac80211: remove assoc data "sent_assoc"
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fdcb786930777231c81f487ab2526d33971a3438;p=linux-beck.git

mac80211: remove assoc data "sent_assoc"

The field is never used, so remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

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 {
 	u8 supp_rates_len;
 	bool wmm, uapsd;
 	bool have_beacon;
-	bool sent_assoc;
 	bool synced;
 
 	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,
 
 		ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
 		ifmgd->assoc_data->have_beacon = true;
-		ifmgd->assoc_data->sent_assoc = false;
 		/* continue assoc process */
 		ifmgd->assoc_data->timeout = jiffies;
 		run_again(ifmgd, ifmgd->assoc_data->timeout);
@@ -3967,13 +3966,11 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 				ifmgd->dtim_period = tim->dtim_period;
 			}
 			assoc_data->have_beacon = true;
-			assoc_data->sent_assoc = false;
 			assoc_data->timeout = jiffies;
 		}
 		rcu_read_unlock();
 	} else {
 		assoc_data->have_beacon = true;
-		assoc_data->sent_assoc = false;
 		assoc_data->timeout = jiffies;
 	}
 	run_again(ifmgd, assoc_data->timeout);