Browse Source

mac80211: remove assoc data "sent_assoc"

The field is never used, so remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Johannes Berg 12 years ago
parent
commit
fdcb786930
2 changed files with 0 additions and 4 deletions
  1. 0 1
      net/mac80211/ieee80211_i.h
  2. 0 3
      net/mac80211/mlme.c

+ 0 - 1
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;

+ 0 - 3
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);