iwlwifi: 3945 drop usage of union tsf

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / iwlwifi / iwl-3945.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index 1c9e126dd23e86813bc5c9f35da354842b187e18..12ead38870200a32ad924fdf76633e89839fee43 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -337,7 +337,7 @@ struct iwl3945_cmd {
                u16 val16;
                u32 val32;
                struct iwl_bt_cmd bt;
-               struct iwl3945_rxon_time_cmd rxon_time;
+               struct iwl_rxon_time_cmd rxon_time;
                struct iwl_powertable_cmd powertable;
                struct iwl_qosparam_cmd qosparam;
                struct iwl3945_tx_cmd tx;
@@ -754,7 +754,7 @@ struct iwl3945_priv {
        struct fw_desc ucode_boot;      /* bootstrap inst */
 
 
-       struct iwl3945_rxon_time_cmd rxon_timing;
+       struct iwl_rxon_time_cmd rxon_timing;
 
        /* We declare this const so it can only be
         * changed via explicit cast within the
@@ -844,8 +844,7 @@ struct iwl3945_priv {
        struct sk_buff *ibss_beacon;
 
        /* Last Rx'd beacon timestamp */
-       u32 timestamp0;
-       u32 timestamp1;
+       u64 timestamp;
        u16 beacon_int;
        struct iwl3945_driver_hw_info hw_setting;
        struct ieee80211_vif *vif;