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/cirrus | |
| 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/cirrus')
| -rw-r--r-- | drivers/net/ethernet/cirrus/cs89x0.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c index 73c1c8c33dd1..aaa0499aa19c 100644 --- a/drivers/net/ethernet/cirrus/cs89x0.c +++ b/drivers/net/ethernet/cirrus/cs89x0.c | |||
| @@ -478,9 +478,6 @@ dma_rx(struct net_device *dev) | |||
| 478 | /* Malloc up new buffer. */ | 478 | /* Malloc up new buffer. */ |
| 479 | skb = netdev_alloc_skb(dev, length + 2); | 479 | skb = netdev_alloc_skb(dev, length + 2); |
| 480 | if (skb == NULL) { | 480 | if (skb == NULL) { |
| 481 | /* I don't think we want to do this to a stressed system */ | ||
| 482 | cs89_dbg(0, err, "%s: Memory squeeze, dropping packet\n", | ||
| 483 | dev->name); | ||
| 484 | dev->stats.rx_dropped++; | 481 | dev->stats.rx_dropped++; |
| 485 | 482 | ||
| 486 | /* AKPM: advance bp to the next frame */ | 483 | /* AKPM: advance bp to the next frame */ |
| @@ -731,9 +728,6 @@ net_rx(struct net_device *dev) | |||
| 731 | /* Malloc up new buffer. */ | 728 | /* Malloc up new buffer. */ |
| 732 | skb = netdev_alloc_skb(dev, length + 2); | 729 | skb = netdev_alloc_skb(dev, length + 2); |
| 733 | if (skb == NULL) { | 730 | if (skb == NULL) { |
| 734 | #if 0 /* Again, this seems a cruel thing to do */ | ||
| 735 | pr_warn("%s: Memory squeeze, dropping packet\n", dev->name); | ||
| 736 | #endif | ||
| 737 | dev->stats.rx_dropped++; | 731 | dev->stats.rx_dropped++; |
| 738 | return; | 732 | return; |
| 739 | } | 733 | } |
