| 1 | ath9k_rx_skb_preprocess nulls rxs and the mactime is never set again - |
| 2 | mactime is always 0. This causes problems in IBSS mode. |
| 3 | |
| 4 | ieee80211_rx_bss_info uses mactime to decide if an IBSS merge is needed. |
| 5 | Without this patch the merge is triggered by each beacon received. |
| 6 | |
| 7 | This can be recognized by the "beacon TSF higher than local TSF - IBSS |
| 8 | merge with BSSID" log message accompanying each beacon. |
| 9 | |
| 10 | This problem was not completely fixed in commit |
| 11 | a6d2055b02dde1067075795274672720baadd3ca and is not a stable kernel fix. |
| 12 | It is solely intended for wireless-testing. |
| 13 | |
| 14 | Signed-off-by: Jan Friedrich <jft@dev2day.de> |
| 15 | --- |
| 16 | drivers/net/wireless/ath/ath9k/recv.c | 10 +++++----- |
| 17 | 1 files changed, 5 insertions(+), 5 deletions(-) |
| 18 | |
| 19 | --- a/drivers/net/wireless/ath/ath9k/recv.c |
| 20 | +++ b/drivers/net/wireless/ath/ath9k/recv.c |
| 21 | @@ -1140,6 +1140,11 @@ int ath_rx_tasklet(struct ath_softc *sc, |
| 22 | if (flush) |
| 23 | goto requeue; |
| 24 | |
| 25 | + retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, |
| 26 | + rxs, &decrypt_error); |
| 27 | + if (retval) |
| 28 | + goto requeue; |
| 29 | + |
| 30 | rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; |
| 31 | if (rs.rs_tstamp > tsf_lower && |
| 32 | unlikely(rs.rs_tstamp - tsf_lower > 0x10000000)) |
| 33 | @@ -1149,11 +1154,6 @@ int ath_rx_tasklet(struct ath_softc *sc, |
| 34 | unlikely(tsf_lower - rs.rs_tstamp > 0x10000000)) |
| 35 | rxs->mactime += 0x100000000ULL; |
| 36 | |
| 37 | - retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, |
| 38 | - rxs, &decrypt_error); |
| 39 | - if (retval) |
| 40 | - goto requeue; |
| 41 | - |
| 42 | /* Ensure we always have an skb to requeue once we are done |
| 43 | * processing the current buffer's skb */ |
| 44 | requeue_skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_ATOMIC); |
| 45 | |
