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.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-dev.h
diff --git
a/drivers/net/wireless/iwlwifi/iwl-dev.h
b/drivers/net/wireless/iwlwifi/iwl-dev.h
index
22a6e3e
..
c8de236
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/
drivers/net/wireless/iwlwifi/iwl-dev.h
@@
-981,17
+981,6
@@
struct traffic_stats {
#endif
};
#endif
};
-/*
- * iwl_switch_rxon: "channel switch" structure
- *
- * @ switch_in_progress: channel switch in progress
- * @ channel: new channel
- */
-struct iwl_switch_rxon {
- bool switch_in_progress;
- __le16 channel;
-};
-
/*
* schedule the timer to wake up every UCODE_TRACE_PERIOD milliseconds
* to perform continuous uCode event logging operation if enabled
/*
* schedule the timer to wake up every UCODE_TRACE_PERIOD milliseconds
* to perform continuous uCode event logging operation if enabled
@@
-1287,7
+1276,7
@@
struct iwl_priv {
struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];
struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];
-
struct iwl_switch_rxon switch_rxon
;
+
__le16 switch_channel
;
struct {
u32 error_event_table;
struct {
u32 error_event_table;