From 66e066a8b7d5294e57af6b24687ee88ff34c88d5 Mon Sep 17 00:00:00 2001 From: Soumik Das Date: Sun, 20 May 2012 15:31:13 +0530 Subject: [PATCH] --- yaml --- r: 309505 b: refs/heads/master c: 992e68bf2eb9f3319f098560b8d4a03aa52fd7b8 h: refs/heads/master i: 309503: 566e2eba9853189b4998abaa521dabd9269ed872 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 25f7cc424e4f..f4e187980e34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edb9bc9a1e08f54adfdb4f4d31bca5a15aeb8ef0 +refs/heads/master: 992e68bf2eb9f3319f098560b8d4a03aa52fd7b8 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index b3b3c264ff66..04c306308987 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -1522,6 +1522,8 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata) * anymore. The timeout will be reset if the frame is ACKed by * the AP. */ + ifmgd->probe_send_count++; + if (sdata->local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) { ifmgd->nullfunc_failed = false; ieee80211_send_nullfunc(sdata->local, sdata, 0); @@ -1538,7 +1540,6 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata) 0, (u32) -1, true, false); } - ifmgd->probe_send_count++; ifmgd->probe_timeout = jiffies + msecs_to_jiffies(probe_wait_ms); run_again(ifmgd, ifmgd->probe_timeout); if (sdata->local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)