diff options
| author | Eliad Peller | 2014-02-11 11:30:18 +0100 |
|---|---|---|
| committer | Johannes Berg | 2014-02-11 12:58:32 +0100 |
| commit | 448cd2e248732326632957e52ea9c44729affcb2 (patch) | |
| tree | 2d75253fd63bec208aff353edeff23dd666ea6fe /net/mac80211/mlme.c | |
| parent | mac80211_hwsim: fix number of channels in interface combinations (diff) | |
| download | kernel-qcow2-linux-448cd2e248732326632957e52ea9c44729affcb2.tar.gz kernel-qcow2-linux-448cd2e248732326632957e52ea9c44729affcb2.tar.xz kernel-qcow2-linux-448cd2e248732326632957e52ea9c44729affcb2.zip | |
mac80211: reset probe_send_count also in HW_CONNECTION_MONITOR case
In case of beacon_loss with IEEE80211_HW_CONNECTION_MONITOR
device, mac80211 probes the ap (and disconnects on timeout)
but ignores the ack.
If we already got an ack, there's no reason to continue
disconnecting. this can help devices that supports
IEEE80211_HW_CONNECTION_MONITOR only partially (e.g. take
care of keep alives, but does not probe the ap.
In case the device wants to disconnect without probing,
it can just call ieee80211_connection_loss.
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 61604834b914..b9432b575444 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -131,13 +131,13 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata) if (unlikely(!sdata->u.mgd.associated)) return; + ifmgd->probe_send_count = 0; + if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR) return; mod_timer(&sdata->u.mgd.conn_mon_timer, round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME)); - - ifmgd->probe_send_count = 0; } static int ecw2cw(int ecw) |