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>
This commit is contained in:

committed by
David S. Miller

parent
e8f83e5ec7
commit
720a43efd3
@@ -651,8 +651,11 @@ if (next_ptr < RX_START || next_ptr >= RX_END) {
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
netif_rx(skb);
|
||||
received ++;
|
||||
} else
|
||||
goto dropping;
|
||||
} else {
|
||||
ether3_outw(next_ptr >> 8, REG_RECVEND);
|
||||
dev->stats.rx_dropped++;
|
||||
goto done;
|
||||
}
|
||||
} else {
|
||||
struct net_device_stats *stats = &dev->stats;
|
||||
ether3_outw(next_ptr >> 8, REG_RECVEND);
|
||||
@@ -679,21 +682,6 @@ done:
|
||||
}
|
||||
|
||||
return maxcnt;
|
||||
|
||||
dropping:{
|
||||
static unsigned long last_warned;
|
||||
|
||||
ether3_outw(next_ptr >> 8, REG_RECVEND);
|
||||
/*
|
||||
* Don't print this message too many times...
|
||||
*/
|
||||
if (time_after(jiffies, last_warned + 10 * HZ)) {
|
||||
last_warned = jiffies;
|
||||
printk("%s: memory squeeze, dropping packet.\n", dev->name);
|
||||
}
|
||||
dev->stats.rx_dropped++;
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
@@ -381,8 +381,6 @@ memory_squeeze:
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += len;
|
||||
} else {
|
||||
printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n",
|
||||
dev->name);
|
||||
dev->stats.rx_dropped++;
|
||||
}
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user