From 69c68eda19107cdede6b951d1cfa150346d52172 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 1 Feb 2011 13:19:07 -0800 Subject: [PATCH] --- yaml --- r: 232871 b: refs/heads/master c: f97f3057fd2febbd7f34a60f09a2cb9cef8bf403 h: refs/heads/master i: 232869: 72a88c78ab88a722a969827878d32260c776ad3d 232867: a73b10c95f22a74e8a1c6cb051c4310c4771e13a 232863: 54f0845b45dcc4ed72597929be5140c18c830953 v: v3 --- [refs] | 2 +- trunk/drivers/net/depca.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d9ce684d8d05..153a6e782bf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ba5e1feaab2762cdf45b490e3f342fedb33f57b +refs/heads/master: f97f3057fd2febbd7f34a60f09a2cb9cef8bf403 diff --git a/trunk/drivers/net/depca.c b/trunk/drivers/net/depca.c index 1b48b68ad4fd..8b0084d17c8c 100644 --- a/trunk/drivers/net/depca.c +++ b/trunk/drivers/net/depca.c @@ -1094,7 +1094,7 @@ static int depca_rx(struct net_device *dev) } } /* Change buffer ownership for this last frame, back to the adapter */ - for (; lp->rx_old != entry; lp->rx_old = (++lp->rx_old) & lp->rxRingMask) { + for (; lp->rx_old != entry; lp->rx_old = (lp->rx_old + 1) & lp->rxRingMask) { writel(readl(&lp->rx_ring[lp->rx_old].base) | R_OWN, &lp->rx_ring[lp->rx_old].base); } writel(readl(&lp->rx_ring[entry].base) | R_OWN, &lp->rx_ring[entry].base); @@ -1103,7 +1103,7 @@ static int depca_rx(struct net_device *dev) /* ** Update entry information */ - lp->rx_new = (++lp->rx_new) & lp->rxRingMask; + lp->rx_new = (lp->rx_new + 1) & lp->rxRingMask; } return 0; @@ -1148,7 +1148,7 @@ static int depca_tx(struct net_device *dev) } /* Update all the pointers */ - lp->tx_old = (++lp->tx_old) & lp->txRingMask; + lp->tx_old = (lp->tx_old + 1) & lp->txRingMask; } return 0;