projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net: macb: Fix race condition in driver when Rx frame is dropped
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
cadence
/
macb.c
diff --git
a/drivers/net/ethernet/cadence/macb.c
b/drivers/net/ethernet/cadence/macb.c
index 665c29098e3c27306e8a276bf2aafc38a5b0f3db..4104d49f005d4a825eb14b99efeb5f158ab456d5 100644
(file)
--- a/
drivers/net/ethernet/cadence/macb.c
+++ b/
drivers/net/ethernet/cadence/macb.c
@@
-707,6
+707,9
@@
static void gem_rx_refill(struct macb *bp)
/* properly align Ethernet header */
skb_reserve(skb, NET_IP_ALIGN);
+ } else {
+ bp->rx_ring[entry].addr &= ~MACB_BIT(RX_USED);
+ bp->rx_ring[entry].ctrl = 0;
}
}