projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
amd
/
ariadne.c
diff --git
a/drivers/net/ethernet/amd/ariadne.c
b/drivers/net/ethernet/amd/ariadne.c
index 98f4522fd17b7e69d3c524568d4b8c991ca80533..c178eb4c81668ad3a1b033f11c9070b9e63c934d 100644
(file)
--- a/
drivers/net/ethernet/amd/ariadne.c
+++ b/
drivers/net/ethernet/amd/ariadne.c
@@
-193,7
+193,6
@@
static int ariadne_rx(struct net_device *dev)
skb = netdev_alloc_skb(dev, pkt_len + 2);
if (skb == NULL) {
- netdev_warn(dev, "Memory squeeze, deferring packet\n");
for (i = 0; i < RX_RING_SIZE; i++)
if (lowb(priv->rx_ring[(entry + i) % RX_RING_SIZE]->RMD1) & RF_OWN)
break;