From 9e7dd457c595c593c9088bc8d31fd9ec66e37293 Mon Sep 17 00:00:00 2001 From: Bruno Randolf Date: Wed, 14 Jul 2010 10:53:29 +0900 Subject: [PATCH] --- yaml --- r: 203708 b: refs/heads/master c: b3f194e54bdbaa4d508488cab24d23c376e235a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath5k/base.c | 7 ++----- trunk/drivers/net/wireless/ath/ath5k/base.h | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 53a206958f85..be0ac90d9b19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 450464def78c94018d997ae6f823578499cdf879 +refs/heads/master: b3f194e54bdbaa4d508488cab24d23c376e235a2 diff --git a/trunk/drivers/net/wireless/ath/ath5k/base.c b/trunk/drivers/net/wireless/ath/ath5k/base.c index b0e1ca99fcad..0d5de2574dd1 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/base.c +++ b/trunk/drivers/net/wireless/ath/ath5k/base.c @@ -1728,8 +1728,6 @@ ath5k_rx_stop(struct ath5k_softc *sc) ath5k_hw_stop_rx_dma(ah); /* disable DMA engine */ ath5k_debug_printrxbuffs(sc, ah); - - sc->rxlink = NULL; /* just in case */ } static unsigned int @@ -2633,8 +2631,7 @@ ath5k_stop_locked(struct ath5k_softc *sc) if (!test_bit(ATH_STAT_INVALID, sc->status)) { ath5k_rx_stop(sc); ath5k_hw_phy_disable(ah); - } else - sc->rxlink = NULL; + } return 0; } @@ -2771,7 +2768,7 @@ ath5k_intr(int irq, void *dev_id) * RXE bit is written, but it doesn't work at * least on older hardware revs. */ - sc->rxlink = NULL; + sc->stats.rxeol_intr++; } if (status & AR5K_INT_TXURN) { /* bump tx trigger level */ diff --git a/trunk/drivers/net/wireless/ath/ath5k/base.h b/trunk/drivers/net/wireless/ath/ath5k/base.h index 86c90f471b74..dc1241f9c4e8 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/base.h +++ b/trunk/drivers/net/wireless/ath/ath5k/base.h @@ -137,6 +137,7 @@ struct ath5k_statistics { unsigned int mib_intr; unsigned int rxorn_intr; + unsigned int rxeol_intr; }; #if CHAN_DEBUG