xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb

Browse Source 
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:
Joe Perches
2013-03-08 15:03:25 +00:00
committed by David S. Miller
parent e8f83e5ec7
commit 720a43efd3
47 changed files with 39 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/i825xx/82596.c
View File

@@ -798,16 +798,14 @@ static inline int i596_rx(struct net_device *dev)
#ifdef __mc68000__
cache_clear(virt_to_phys(newskb->data), PKT_BUF_SZ);
#endif
}
else
} else {
skb = netdev_alloc_skb(dev, pkt_len + 2);
}
memory_squeeze:
if (skb == NULL) {
/* XXX tulip.c can defer packets here!! */
printk(KERN_WARNING "%s: i596_rx Memory squeeze, dropping packet.\n", dev->name);
dev->stats.rx_dropped++;
}
else {
} else {
if (!rx_in_place) {
/* 16 byte align the data fields */
skb_reserve(skb, 2);

6
drivers/net/ethernet/i825xx/lib82596.c
View File

@@ -715,14 +715,12 @@ static inline int i596_rx(struct net_device *dev)
rbd->v_data = newskb->data;
rbd->b_data = SWAP32(dma_addr);
DMA_WBACK_INV(dev, rbd, sizeof(struct i596_rbd));
} else
} else {
skb = netdev_alloc_skb_ip_align(dev, pkt_len);
}
memory_squeeze:
if (skb == NULL) {
/* XXX tulip.c can defer packets here!! */
printk(KERN_ERR
"%s: i596_rx Memory squeeze, dropping packet.\n",
dev->name);
dev->stats.rx_dropped++;
} else {
if (!rx_in_place) {