diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-02 14:25:38 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-02 14:25:38 -0500 |
| commit | 4b074b07625f603d40d4d04937f8874a00415dc4 (patch) | |
| tree | 2dffdc46e3fea0320524f483cf5ac2c058ab59f2 /drivers/net/wireless/brcm80211/brcmfmac/p2p.c | |
| parent | 7d68849f40cd9169088249cc889d95c8998c3fb8 (diff) | |
| parent | ddcc347b70f298f9d624cd0e250581d831d915fb (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/p2p.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c index 4a229304182..d3180360725 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c @@ -812,7 +812,7 @@ static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg, struct ieee80211_channel *chan = request->channels[i]; if (chan->flags & (IEEE80211_CHAN_RADAR | - IEEE80211_CHAN_PASSIVE_SCAN)) + IEEE80211_CHAN_NO_IR)) continue; chanspecs[i] = channel_to_chanspec(&p2p->cfg->d11inf, |