Commit fdcb7869 authored by Johannes Berg's avatar Johannes Berg

mac80211: remove assoc data "sent_assoc"

The field is never used, so remove it.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent cd8f7cb4
...@@ -400,7 +400,6 @@ struct ieee80211_mgd_assoc_data { ...@@ -400,7 +400,6 @@ struct ieee80211_mgd_assoc_data {
u8 supp_rates_len; u8 supp_rates_len;
bool wmm, uapsd; bool wmm, uapsd;
bool have_beacon; bool have_beacon;
bool sent_assoc;
bool synced; bool synced;
u8 ap_ht_param; u8 ap_ht_param;
......
...@@ -2555,7 +2555,6 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ...@@ -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); ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
ifmgd->assoc_data->have_beacon = true; ifmgd->assoc_data->have_beacon = true;
ifmgd->assoc_data->sent_assoc = false;
/* continue assoc process */ /* continue assoc process */
ifmgd->assoc_data->timeout = jiffies; ifmgd->assoc_data->timeout = jiffies;
run_again(ifmgd, ifmgd->assoc_data->timeout); run_again(ifmgd, ifmgd->assoc_data->timeout);
...@@ -3967,13 +3966,11 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -3967,13 +3966,11 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
ifmgd->dtim_period = tim->dtim_period; ifmgd->dtim_period = tim->dtim_period;
} }
assoc_data->have_beacon = true; assoc_data->have_beacon = true;
assoc_data->sent_assoc = false;
assoc_data->timeout = jiffies; assoc_data->timeout = jiffies;
} }
rcu_read_unlock(); rcu_read_unlock();
} else { } else {
assoc_data->have_beacon = true; assoc_data->have_beacon = true;
assoc_data->sent_assoc = false;
assoc_data->timeout = jiffies; assoc_data->timeout = jiffies;
} }
run_again(ifmgd, assoc_data->timeout); run_again(ifmgd, assoc_data->timeout);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment