| From foo@baz Mon Sep 17 12:33:31 CEST 2018 |
| From: Loic Poulain <loic.poulain@linaro.org> |
| Date: Fri, 27 Jul 2018 18:30:23 +0200 |
| Subject: wlcore: Set rx_status boottime_ns field on rx |
| |
| From: Loic Poulain <loic.poulain@linaro.org> |
| |
| [ Upstream commit 37a634f60fd6dfbda2c312657eec7ef0750546e7 ] |
| |
| When receiving a beacon or probe response, we should update the |
| boottime_ns field which is the timestamp the frame was received at. |
| (cf mac80211.h) |
| |
| This fixes a scanning issue with Android since it relies on this |
| timestamp to determine when the AP has been seen for the last time |
| (via the nl80211 BSS_LAST_SEEN_BOOTTIME parameter). |
| |
| Signed-off-by: Loic Poulain <loic.poulain@linaro.org> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireless/ti/wlcore/rx.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/wireless/ti/wlcore/rx.c |
| +++ b/drivers/net/wireless/ti/wlcore/rx.c |
| @@ -59,7 +59,7 @@ static u32 wlcore_rx_get_align_buf_size( |
| static void wl1271_rx_status(struct wl1271 *wl, |
| struct wl1271_rx_descriptor *desc, |
| struct ieee80211_rx_status *status, |
| - u8 beacon) |
| + u8 beacon, u8 probe_rsp) |
| { |
| memset(status, 0, sizeof(struct ieee80211_rx_status)); |
| |
| @@ -106,6 +106,9 @@ static void wl1271_rx_status(struct wl12 |
| } |
| } |
| |
| + if (beacon || probe_rsp) |
| + status->boottime_ns = ktime_get_boot_ns(); |
| + |
| if (beacon) |
| wlcore_set_pending_regdomain_ch(wl, (u16)desc->channel, |
| status->band); |
| @@ -191,7 +194,8 @@ static int wl1271_rx_handle_data(struct |
| if (ieee80211_is_data_present(hdr->frame_control)) |
| is_data = 1; |
| |
| - wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon); |
| + wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon, |
| + ieee80211_is_probe_resp(hdr->frame_control)); |
| wlcore_hw_set_rx_csum(wl, desc, skb); |
| |
| seq_num = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4; |
