diff options
| author | John W. Linville | 2014-02-13 20:43:02 +0100 |
|---|---|---|
| committer | John W. Linville | 2014-02-13 20:43:02 +0100 |
| commit | 0e028ab0fb2da47fd235dafd4159859892e73d08 (patch) | |
| tree | e9e1348372b413e6b1b503209582b03c9005f614 /net/mac80211/ibss.c | |
| parent | mwifiex: add key material v2 support (diff) | |
| parent | rtl8180: Add error check for pci_map_single return value in TX path (diff) | |
| download | kernel-qcow2-linux-0e028ab0fb2da47fd235dafd4159859892e73d08.tar.gz kernel-qcow2-linux-0e028ab0fb2da47fd235dafd4159859892e73d08.tar.xz kernel-qcow2-linux-0e028ab0fb2da47fd235dafd4159859892e73d08.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 9c84b75f3de8..4453e2725e40 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -684,12 +684,9 @@ static void ieee80211_ibss_disconnect(struct ieee80211_sub_if_data *sdata) struct cfg80211_bss *cbss; struct beacon_data *presp; struct sta_info *sta; - int active_ibss; u16 capability; - active_ibss = ieee80211_sta_active_ibss(sdata); - - if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) { + if (!is_zero_ether_addr(ifibss->bssid)) { capability = WLAN_CAPABILITY_IBSS; if (ifibss->privacy) |