On Saturday 10 March 2012 01:40:08 Ashok Nagarajan wrote: > mactime was being overwritten by the function > ath9k_rx_skb_preprocess. Fixed by calling the > function before setting the mactime. This looks rather odd... In essence you're trying to revert "ath9k: trivial: reorder rx_tasklet processing" Anyway, I 'CC'ed the original author Zefir Kurtisi. So if there are any open question, now is the time. > Signed-off-by: Ashok Nagarajan <ashok@xxxxxxxxxxx> > Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx> > --- > drivers/net/wireless/ath/ath9k/recv.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c > index 1b1b279..52a0466 100644 > --- a/drivers/net/wireless/ath/ath9k/recv.c > +++ b/drivers/net/wireless/ath/ath9k/recv.c > @@ -1841,6 +1841,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) > if (sc->sc_flags & SC_OP_RXFLUSH) > goto requeue_drop_frag; > > + retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, > + rxs, &decrypt_error); > + Instead of moving ath9k_rx_skb_preprocess around, you could just put the memset(rx_status, 0, sizeof(struct ieee80211_rx_status)); right here. [Also, why leave the if (retval) check behind?] > rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; > if (rs.rs_tstamp > tsf_lower && > unlikely(rs.rs_tstamp - tsf_lower > 0x10000000)) > @@ -1850,8 +1853,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) > unlikely(tsf_lower - rs.rs_tstamp > 0x10000000)) > rxs->mactime += 0x100000000ULL; > > - retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, > - rxs, &decrypt_error); > if (retval) > goto requeue_drop_frag; ^^ that one -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
