summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/amd/ariadne.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-03-08 16:03:25 +0100
committerDavid S. Miller <davem@davemloft.net>2013-03-09 22:09:19 +0100
commit720a43efd30f04a0a492c85fb997361c44fbae05 (patch)
tree430e9488e00413655b7947f67e82c4fd2c07e951 /drivers/net/ethernet/amd/ariadne.c
parentqlcnic: Bump up the version to 5.1.36 (diff)
downloadlinux-720a43efd30f04a0a492c85fb997361c44fbae05.tar.xz
linux-720a43efd30f04a0a492c85fb997361c44fbae05.zip
drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb
Emitting netdev_alloc_skb and netdev_alloc_skb_ip_align OOM messages is unnecessary as there is already a dump_stack after allocation failures. Other trivial changes around these removals: Convert a few comparisons of pointer to 0 to !pointer. Change flow to remove unnecessary label. Remove now unused variable. Hoist assignment from if. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/ariadne.c')
-rw-r--r--drivers/net/ethernet/amd/ariadne.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index 98f4522fd17b..c178eb4c8166 100644
--- 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;