git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
brcm80211
/
brcmfmac
/
p2p.c
diff --git
a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 4a2293041821ff708c6cefef86ed21406f18266c..d3180360725925c40f6e59bf09bdfb28e18a4300 100644
(file)
--- 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,