aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 30a0034b9124..2ded4766d014 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -915,8 +915,6 @@ static void ieee80211_direct_probe(struct ieee80211_sub_if_data *sdata)
915 915
916 ifmgd->state = IEEE80211_STA_MLME_DIRECT_PROBE; 916 ifmgd->state = IEEE80211_STA_MLME_DIRECT_PROBE;
917 917
918 set_bit(IEEE80211_STA_REQ_DIRECT_PROBE, &ifmgd->request);
919
920 /* Direct probe is sent to broadcast address as some APs 918 /* Direct probe is sent to broadcast address as some APs
921 * will not answer to direct packet in unassociated state. 919 * will not answer to direct packet in unassociated state.
922 */ 920 */
@@ -1738,8 +1736,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
1738 ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false); 1736 ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false);
1739 1737
1740 /* direct probe may be part of the association flow */ 1738 /* direct probe may be part of the association flow */
1741 if (test_and_clear_bit(IEEE80211_STA_REQ_DIRECT_PROBE, 1739 if (ifmgd->state == IEEE80211_STA_MLME_DIRECT_PROBE) {
1742 &ifmgd->request)) {
1743 printk(KERN_DEBUG "%s direct probe responded\n", 1740 printk(KERN_DEBUG "%s direct probe responded\n",
1744 sdata->dev->name); 1741 sdata->dev->name);
1745 ieee80211_authenticate(sdata); 1742 ieee80211_authenticate(sdata);