iwlwifi: move shared pointers to iwl_priv

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index 17c4bcfe113b..e5ab4c01ec9b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -576,8 +576,6 @@ struct iwl4965_ibss_seq {
  * @max_rxq_log: Log-base-2 of max_rxq_size
  * @max_stations:
  * @bcast_sta_id:
- * @shared_virt: Pointer to driver/uCode shared Tx Byte Counts and Rx status
- * @shared_phys: Physical Pointer to Tx Byte Counts and Rx status
  */
 struct iwl4965_driver_hw_info {
         u16 max_txq_num;
@@ -589,8 +587,6 @@ struct iwl4965_driver_hw_info {
         u16 max_rxq_log;
         u8  max_stations;
         u8  bcast_sta_id;
-        void *shared_virt;
-        dma_addr_t shared_phys;
 };
 
 #define HT_SHORT_GI_20MHZ_ONLY          (1 << 0)
@@ -1147,9 +1143,14 @@ struct iwl_priv {
         /* Last Rx'd beacon timestamp */
         u64 timestamp;
         u16 beacon_int;
-        struct iwl4965_driver_hw_info hw_setting;
         struct ieee80211_vif *vif;
 
+        struct iwl4965_driver_hw_info hw_setting;
+        /* driver/uCode shared Tx Byte Counts and Rx status */
+        void *shared_virt;
+        /* Physical Pointer to Tx Byte Counts and Rx status */
+        dma_addr_t shared_phys;
+
         /* Current association information needed to configure the
          * hardware */
         u16 assoc_id;