[PATCH 3.5 40/64] net: mv643xx_eth: update statistics timer from timer context only

From: Luis Henriques
Date: Mon Oct 28 2013 - 10:58:36 EST -stable review patch. If anyone has any objections, please let me know.


From: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>

commit 041b4ddb84989f06ff1df0ca869b950f1ee3cb1c upstream.

Each port driver installs a periodic timer to update port statistics
by calling mib_counters_update. As mib_counters_update is also called
from non-timer context, we should not reschedule the timer there but
rather move it to timer-only context.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>
Acked-by: Jason Cooper <jason@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx>
drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 7197e0f..ae50dd6 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1273,15 +1273,13 @@ static void mib_counters_update(struct mv643xx_eth_private *mp)
p->rx_discard += rdlp(mp, RX_DISCARD_FRAME_CNT);
p->rx_overrun += rdlp(mp, RX_OVERRUN_FRAME_CNT);
- mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ);

static void mib_counters_timer_wrapper(unsigned long _mp)
struct mv643xx_eth_private *mp = (void *)_mp;
+ mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ);


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/