aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/dlink
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-03-08 10:03:25 -0500
committerDavid S. Miller <davem@davemloft.net>2013-03-09 16:09:19 -0500
commit720a43efd30f04a0a492c85fb997361c44fbae05 (patch)
tree430e9488e00413655b7947f67e82c4fd2c07e951 /drivers/net/ethernet/dlink
parente8f83e5ec7450b85b101a774e165e70a18e9c3ab (diff)
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/dlink')
-rw-r--r--drivers/net/ethernet/dlink/dl2k.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c
index 110d26f4c602..afa8e3af2c4d 100644
--- a/drivers/net/ethernet/dlink/dl2k.c
+++ b/drivers/net/ethernet/dlink/dl2k.c
@@ -580,12 +580,9 @@ alloc_list (struct net_device *dev)
580 580
581 skb = netdev_alloc_skb_ip_align(dev, np->rx_buf_sz); 581 skb = netdev_alloc_skb_ip_align(dev, np->rx_buf_sz);
582 np->rx_skbuff[i] = skb; 582 np->rx_skbuff[i] = skb;
583 if (skb == NULL) { 583 if (skb == NULL)
584 printk (KERN_ERR
585 "%s: alloc_list: allocate Rx buffer error! ",
586 dev->name);
587 break; 584 break;
588 } 585
589 /* Rubicon now supports 40 bits of addressing space. */ 586 /* Rubicon now supports 40 bits of addressing space. */
590 np->rx_ring[i].fraginfo = 587 np->rx_ring[i].fraginfo =
591 cpu_to_le64 ( pci_map_single ( 588 cpu_to_le64 ( pci_map_single (