diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-12 11:46:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-12 11:46:58 -0400 |
| commit | 7fd38193d0473acc6e8f108107d0466f07768853 (patch) | |
| tree | 076f5d81a643c818dcf6561dad0f3d75d1049dc5 /net/mac80211/mlme.c | |
| parent | 488992916c50890fbe5e7057e29681a4c4fdf1f8 (diff) | |
| parent | 46fa38e84b656f80edf83d21144221b0cad18d61 (diff) | |
| download | linux-7fd38193d0473acc6e8f108107d0466f07768853.tar.bz2 | |
Merge tag 'mac80211-next-for-davem-2016-05-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Some more work for 4.7, notably:
* completion and fixups of nla_put_64_64bit() work
* remove a/b/g/n from wext nickname to avoid confusion
with 11ac (which wouldn't even fit fully there due to
string length restrictions)
along with some other minor changes/cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 885f4ca0888d..8d426f637f58 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2399,6 +2399,11 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata) return; } + /* AP is probably out of range (or not reachable for another reason) so + * remove the bss struct for that AP. + */ + cfg80211_unlink_bss(local->hw.wiphy, ifmgd->associated); + ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, true, frame_buf); |