mwifiex: fix missing tsf_val TLV

In mwifiex_cmd_append_tsf_tlv(), two tsf_val TLVs should be
filled in the buffer and then sent to firmware.

The missing first TLV for tsf_val is added back in this patch.

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 042eb7701d04..85fca5eb4195 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -100,7 +100,7 @@ mwifiex_cmd_append_tsf_tlv(struct mwifiex_private *priv, u8 **buffer,
                            struct mwifiex_bssdescriptor *bss_desc)
 {
         struct mwifiex_ie_types_tsf_timestamp tsf_tlv;
-        long long tsf_val;
+        __le64 tsf_val;
 
         /* Null Checks */
         if (buffer == NULL)
@@ -116,6 +116,11 @@ mwifiex_cmd_append_tsf_tlv(struct mwifiex_private *priv, u8 **buffer,
         memcpy(*buffer, &tsf_tlv, sizeof(tsf_tlv.header));
         *buffer += sizeof(tsf_tlv.header);
 
+        /* TSF at the time when beacon/probe_response was received */
+        tsf_val = cpu_to_le64(bss_desc->network_tsf);
+        memcpy(*buffer, &tsf_val, sizeof(tsf_val));
+        *buffer += sizeof(tsf_val);
+
         memcpy(&tsf_val, bss_desc->time_stamp, sizeof(tsf_val));
 
         dev_dbg(priv->adapter->dev, "info: %s: TSF offset calc: %016llx - "
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 1b503038270e..5043fcd22565 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -280,7 +280,7 @@ struct mwifiex_bssdescriptor {
          * BAND_A(0X04): 'a' band
          */
         u16 bss_band;
-        long long network_tsf;
+        u64 network_tsf;
         u8 time_stamp[8];
         union ieee_types_phy_param_set phy_param_set;
         union ieee_types_ss_param_set ss_param_set;