diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-10 17:37:43 +0000 |
| commit | 4b9c8ddadce3ec70fa5d93875adeda861b21c84e (patch) | |
| tree | 6ed53e819e5c763f751ff968a650b236d2d02545 /drivers/net/wireless/mwifiex/scan.c | |
| parent | 51ad557e21b8713f3abc286c14bca4ed01b8e56d (diff) | |
| parent | 1569265782ef26ed77ce45ebeb0676f11d4c114a (diff) | |
Merge tag 'v3.10.29' into linux-linaro-lsk
This is the 3.10.29 stable release
Diffstat (limited to 'drivers/net/wireless/mwifiex/scan.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c index 9cf5d8f07df..50b2fe53219 100644 --- a/drivers/net/wireless/mwifiex/scan.c +++ b/drivers/net/wireless/mwifiex/scan.c @@ -1622,7 +1622,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv, const u8 *ie_buf; size_t ie_len; u16 channel = 0; - u64 fw_tsf = 0; + __le64 fw_tsf = 0; u16 beacon_size = 0; u32 curr_bcn_bytes; u32 freq; @@ -1749,7 +1749,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv, ie_buf, ie_len, rssi, GFP_KERNEL); bss_priv = (struct mwifiex_bss_priv *)bss->priv; bss_priv->band = band; - bss_priv->fw_tsf = fw_tsf; + bss_priv->fw_tsf = le64_to_cpu(fw_tsf); if (priv->media_connected && !memcmp(bssid, priv->curr_bss_params.bss_descriptor |