diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-17 16:14:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-17 16:14:29 -0400 |
| commit | 5cda73b68ebf7e08586d61e6777e64e12df23f07 (patch) | |
| tree | 54e7d4409f96e519a6e1ef4ff2a057785df5f6f1 /net/mac80211/scan.c | |
| parent | 0baf2b35fc70ab16c385963d2502da26a55d2cb7 (diff) | |
| parent | 9f96da4dd2ccf685b506a21104cb13b1aadd907a (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
This is a batch of updates intended for the 3.13 stream...
The biggest item of interest in here is wcn36xx, the new mac80211
driver for Qualcomm WCN3660/WCN3680 hardware.
Regarding the mac80211 bits, Johannes says:
"We have an assortment of cleanups and new features, of which the
biggest one is probably the channel-switch support in IBSS. Nothing
else really stands out much."
On top of that, the ath9k and rt2x00 get a lot of update action from
Felix Fietkau and Gabor Juhos, respectively. There are a handful of
updates to other drivers here and there as well.
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 08afe74b98f..ecb57b0bf74 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -391,8 +391,7 @@ static bool ieee80211_can_scan(struct ieee80211_local *local, return false; if (sdata->vif.type == NL80211_IFTYPE_STATION && - sdata->u.mgd.flags & (IEEE80211_STA_BEACON_POLL | - IEEE80211_STA_CONNECTION_POLL)) + sdata->u.mgd.flags & IEEE80211_STA_CONNECTION_POLL) return false; return true; |