2012-03-10 02:57:50

by Ashok Nagarajan

Subject: [PATCH v2] ath9k: Fix mactime from being clobbered in rx_status

mactime was being overwritten by the function ath9k_rx_skb_preprocess. Fixed by
memsetting rx_status in ath_rx_tasklet.

Signed-off-by: Ashok Nagarajan <[email protected]>
Signed-off-by: Javier Cardona <[email protected]>
---
v1:
Fix reverting "ath9k: trivial: reorder rx_tasklet processing" logic (Christian
Lamparter)
drivers/net/wireless/ath/ath9k/recv.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 1b1b279..f4ae3ba 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -982,8 +982,6 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common,
{
struct ath_hw *ah = common->ah;

- memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
-
/*
* everything but the rate is checked here, the rate check is done
* separately to avoid doing two lookups for a rate for each frame.
@@ -1841,6 +1839,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
if (sc->sc_flags & SC_OP_RXFLUSH)
goto requeue_drop_frag;

+ memset(rxs, 0, sizeof(struct ieee80211_rx_status));
+
rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
if (rs.rs_tstamp > tsf_lower &&
unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))
--
1.7.5.4

2012-03-10 10:48:27

by Mohammed Shafi

Subject: Re: [PATCH v2] ath9k: Fix mactime from being clobbered in rx_status

On Sat, Mar 10, 2012 at 8:27 AM, Ashok Nagarajan <[email protected]> wrote:
> mactime was being overwritten by the function ath9k_rx_skb_preprocess. Fixed by
> memsetting rx_status in ath_rx_tasklet.

thanks for fixing this. now i can see a proper non-zero MAC time stamp
in ath9k sniffer.

>
> Signed-off-by: Ashok Nagarajan <[email protected]>
> Signed-off-by: Javier Cardona <[email protected]>
> ---
> v1:
> Fix reverting "ath9k: trivial: reorder rx_tasklet processing" logic (Christian
> Lamparter)
> ?drivers/net/wireless/ath/ath9k/recv.c | ? ?4 ++--
> ?1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
> index 1b1b279..f4ae3ba 100644
> --- a/drivers/net/wireless/ath/ath9k/recv.c
> +++ b/drivers/net/wireless/ath/ath9k/recv.c
> @@ -982,8 +982,6 @@ static int ath9k_rx_skb_preprocess(struct ath_common *common,
> ?{
> ? ? ? ?struct ath_hw *ah = common->ah;
>
> - ? ? ? memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
> -
> ? ? ? ?/*
> ? ? ? ? * everything but the rate is checked here, the rate check is done
> ? ? ? ? * separately to avoid doing two lookups for a rate for each frame.
> @@ -1841,6 +1839,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
> ? ? ? ? ? ? ? ?if (sc->sc_flags & SC_OP_RXFLUSH)
> ? ? ? ? ? ? ? ? ? ? ? ?goto requeue_drop_frag;
>
> + ? ? ? ? ? ? ? memset(rxs, 0, sizeof(struct ieee80211_rx_status));
> +
> ? ? ? ? ? ? ? ?rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
> ? ? ? ? ? ? ? ?if (rs.rs_tstamp > tsf_lower &&
> ? ? ? ? ? ? ? ? ? ?unlikely(rs.rs_tstamp - tsf_lower > 0x10000000))
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html



--
thanks,
shafi