diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-08-23 04:46:40 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-08-27 12:15:20 -0400 |
commit | 8bd413e611d4324f17e54a2a89b4d09216c22a37 (patch) | |
tree | 64385ef0b39d6216bc5cacab03b68a18c90b92a5 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
parent | c90cbbbd78e45abbefd5e9e1c3c179d6126e3ddf (diff) |
iwlwifi: move virtual interface pointer into context
iwlwifi occasionally needs to find the virtual
interface pointer to give it to mac80211, but right
now it only keeps one. Move it into the context so
that we can keep one pointer each.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 90bf6b317fc7..a332ec55f149 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -1114,6 +1114,7 @@ enum iwl_rxon_context_id { | |||
1114 | }; | 1114 | }; |
1115 | 1115 | ||
1116 | struct iwl_rxon_context { | 1116 | struct iwl_rxon_context { |
1117 | struct ieee80211_vif *vif; | ||
1117 | enum iwl_rxon_context_id ctxid; | 1118 | enum iwl_rxon_context_id ctxid; |
1118 | /* | 1119 | /* |
1119 | * We declare this const so it can only be | 1120 | * We declare this const so it can only be |
@@ -1321,7 +1322,6 @@ struct iwl_priv { | |||
1321 | 1322 | ||
1322 | /* Last Rx'd beacon timestamp */ | 1323 | /* Last Rx'd beacon timestamp */ |
1323 | u64 timestamp; | 1324 | u64 timestamp; |
1324 | struct ieee80211_vif *vif; | ||
1325 | 1325 | ||
1326 | union { | 1326 | union { |
1327 | #if defined(CONFIG_IWL3945) || defined(CONFIG_IWL3945_MODULE) | 1327 | #if defined(CONFIG_IWL3945) || defined(CONFIG_IWL3945_MODULE) |