projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-next-for-davem-2015-05-06' into iwlwifi-next
[linux-2.6-block.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-nvm-parse.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
index 75e96db6626b185684c93687e5f4d020b60dc50e..830dfec66a44ef80a4822edf02dd09bd0767043d 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
@@
-249,7
+249,7
@@
static u32 iwl_get_channel_flags(u8 ch_num, int ch_idx, bool is_5ghz,
*/
if ((nvm_flags & NVM_CHANNEL_GO_CONCURRENT) &&
(flags & IEEE80211_CHAN_NO_IR))
- flags |= IEEE80211_CHAN_
GO
_CONCURRENT;
+ flags |= IEEE80211_CHAN_
IR
_CONCURRENT;
return flags;
}