diff options
author | Joe Perches <joe@perches.com> | 2013-03-08 10:03:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-09 16:09:19 -0500 |
commit | 720a43efd30f04a0a492c85fb997361c44fbae05 (patch) | |
tree | 430e9488e00413655b7947f67e82c4fd2c07e951 /drivers/net/ethernet/sun | |
parent | e8f83e5ec7450b85b101a774e165e70a18e9c3ab (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/sun')
-rw-r--r-- | drivers/net/ethernet/sun/sunqe.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c index 49bf3e2eb652..8182591bc187 100644 --- a/drivers/net/ethernet/sun/sunqe.c +++ b/drivers/net/ethernet/sun/sunqe.c | |||
@@ -414,7 +414,7 @@ static void qe_rx(struct sunqe *qep) | |||
414 | struct qe_rxd *this; | 414 | struct qe_rxd *this; |
415 | struct sunqe_buffers *qbufs = qep->buffers; | 415 | struct sunqe_buffers *qbufs = qep->buffers; |
416 | __u32 qbufs_dvma = qep->buffers_dvma; | 416 | __u32 qbufs_dvma = qep->buffers_dvma; |
417 | int elem = qep->rx_new, drops = 0; | 417 | int elem = qep->rx_new; |
418 | u32 flags; | 418 | u32 flags; |
419 | 419 | ||
420 | this = &rxbase[elem]; | 420 | this = &rxbase[elem]; |
@@ -436,7 +436,6 @@ static void qe_rx(struct sunqe *qep) | |||
436 | } else { | 436 | } else { |
437 | skb = netdev_alloc_skb(dev, len + 2); | 437 | skb = netdev_alloc_skb(dev, len + 2); |
438 | if (skb == NULL) { | 438 | if (skb == NULL) { |
439 | drops++; | ||
440 | dev->stats.rx_dropped++; | 439 | dev->stats.rx_dropped++; |
441 | } else { | 440 | } else { |
442 | skb_reserve(skb, 2); | 441 | skb_reserve(skb, 2); |
@@ -456,8 +455,6 @@ static void qe_rx(struct sunqe *qep) | |||
456 | this = &rxbase[elem]; | 455 | this = &rxbase[elem]; |
457 | } | 456 | } |
458 | qep->rx_new = elem; | 457 | qep->rx_new = elem; |
459 | if (drops) | ||
460 | printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n", qep->dev->name); | ||
461 | } | 458 | } |
462 | 459 | ||
463 | static void qe_tx_reclaim(struct sunqe *qep); | 460 | static void qe_tx_reclaim(struct sunqe *qep); |