diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-03 05:05:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-03 05:05:58 +0300 |
| commit | 3715544750e4a250f881254900cccebc57509fde (patch) | |
| tree | 478205aefd34a74a0ed2f236c19291973d519fa4 /drivers/net/ethernet/cadence/macb.c | |
| parent | 629161f649ca259cfc1473a98347b941dd7a52bc (diff) | |
| parent | 6c3c1eb3c35e8856d6dcb01b412316a676f58bbe (diff) | |
| download | linux-3715544750e4a250f881254900cccebc57509fde.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb.c')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 665c29098e3c..4104d49f005d 100644 --- 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; } } |