git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[safe/jmp/linux-2.6]
/
net
/
mac80211
/
main.c
diff --git
a/net/mac80211/main.c
b/net/mac80211/main.c
index
bd632e1
..
22a384d
100644
(file)
--- 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 ||