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/iwlegacy/common.c | |
| parent | 7d68849f40cd9169088249cc889d95c8998c3fb8 (diff) | |
| parent | ddcc347b70f298f9d624cd0e250581d831d915fb (diff) | |
| download | op-kernel-dev-4b074b07625f603d40d4d04937f8874a00415dc4.zip op-kernel-dev-4b074b07625f603d40d4d04937f8874a00415dc4.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
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 b03e22e..a27b14c 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; |
