Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 232871
b: refs/heads/master
c: f97f305
h: refs/heads/master
i:
  232869: 72a88c7
  232867: a73b10c
  232863: 54f0845
v: v3
  • Loading branch information
Alan Cox authored and David S. Miller committed Feb 1, 2011
1 parent 73824f9 commit 69c68ed
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ba5e1feaab2762cdf45b490e3f342fedb33f57b
refs/heads/master: f97f3057fd2febbd7f34a60f09a2cb9cef8bf403
6 changes: 3 additions & 3 deletions trunk/drivers/net/depca.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 69c68ed

Please sign in to comment.