diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-11 20:24:55 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-11 20:24:55 +0200 |
| commit | cc755896a4274f11283bca32d1d658203844057a (patch) | |
| tree | 218970ece71df99f686b9416b7fd88b921690ebb /net/mac80211/main.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| parent | wireless: depends on NET (diff) | |
| download | linux-cc755896a4274f11283bca32d1d658203844057a.tar.xz linux-cc755896a4274f11283bca32d1d658203844057a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index bd632e1ee2c5..22a384dfab65 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -111,7 +111,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) channel_type = local->tmp_channel_type; } else { chan = local->oper_channel; - channel_type = local->oper_channel_type; + channel_type = local->_oper_channel_type; } if (chan != local->hw.conf.channel || |