From d92434cdfebdaea4761e2ee32b0266fbc3de652b Mon Sep 17 00:00:00 2001 From: Bruno Randolf Date: Tue, 5 Aug 2008 19:32:23 +0200 Subject: [PATCH] --- yaml --- r: 111208 b: refs/heads/master c: 06303352d3de02a371ccaec1366a92db5e1d7c30 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath5k/base.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7a81ecdef298..2838c3be68f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edcc25b22f7c328f56e8c129afa1e10c8bacb2ef +refs/heads/master: 06303352d3de02a371ccaec1366a92db5e1d7c30 diff --git a/trunk/drivers/net/wireless/ath5k/base.c b/trunk/drivers/net/wireless/ath5k/base.c index c1de1ef09e59..cd598c0d8d6d 100644 --- a/trunk/drivers/net/wireless/ath5k/base.c +++ b/trunk/drivers/net/wireless/ath5k/base.c @@ -1763,12 +1763,10 @@ ath5k_tasklet_rx(unsigned long data) rxs.rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate); rxs.flag |= ath5k_rx_decrypted(sc, ds, skb, &rs); -#if 0 /* add rxs.flag SHORTPRE once it is in mac80211 */ - if (rs.rs_rate >= ATH5K_RATE_CODE_2M && - rs.rs_rate <= ATH5K_RATE_CODE_11M && - rs.rs_rate & AR5K_SET_SHORT_PREAMBLE) + if (rxs.rate_idx >= 0 && rs.rs_rate == + sc->curband->bitrates[rxs.rate_idx].hw_value_short) rxs.flag |= RX_FLAG_SHORTPRE; -#endif + ath5k_debug_dump_skb(sc, skb, "RX ", 0); /* check beacons in IBSS mode */