projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'wireless-next/master' into ath6kl-next
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
ath
/
ath6kl
/
main.c
diff --git
a/drivers/net/wireless/ath/ath6kl/main.c
b/drivers/net/wireless/ath/ath6kl/main.c
index
45621ba
..
c189e28
100644
(file)
--- a/
drivers/net/wireless/ath/ath6kl/main.c
+++ b/
drivers/net/wireless/ath/ath6kl/main.c
@@
-602,7
+602,6
@@
static int ath6kl_commit_ch_switch(struct ath6kl_vif *vif, u16 channel)
struct ath6kl *ar = vif->ar;
- vif->next_chan = channel;
vif->profile.ch = cpu_to_le16(channel);
switch (vif->nw_type) {