diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 19:37:24 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 19:37:24 +0400 |
| commit | d86804cb70f93ca5e4c0fb13402962fbfb705c53 (patch) | |
| tree | ca4e7da3541267ad909a2b73228406503e198ffa /drivers/net/wireless/iwlegacy/common.c | |
| parent | d70f2cf520cf8c86c6b467fc5dcea524ec51dc2f (diff) | |
| parent | e08fd975bf26aa8063cadd245817e042f570472d (diff) | |
| download | linux-d86804cb70f93ca5e4c0fb13402962fbfb705c53.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index b03e22ef5462..a27b14cfeaec 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c @@ -3445,10 +3445,10 @@ il_init_geos(struct il_priv *il) if (il_is_channel_valid(ch)) { if (!(ch->flags & EEPROM_CHANNEL_IBSS)) - geo_ch->flags |= IEEE80211_CHAN_NO_IBSS; + geo_ch->flags |= IEEE80211_CHAN_NO_IR; if (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) - geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN; + geo_ch->flags |= IEEE80211_CHAN_NO_IR; if (ch->flags & EEPROM_CHANNEL_RADAR) geo_ch->flags |= IEEE80211_CHAN_RADAR; |