git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-6000.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-6000.c
b/drivers/net/wireless/iwlwifi/iwl-6000.c
index
fda6fe0
..
fbe565c
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-6000.c
@@
-270,8
+270,6
@@
static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
ctx->active.channel, ch);
return -EFAULT;
}
- priv->switch_rxon.channel = cmd.channel;
- priv->switch_rxon.switch_in_progress = true;
return iwl_send_cmd_sync(priv, &hcmd);
}