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
@@ -177,8 +177,6 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
|
||||
received++;
|
||||
netif_receive_skb(skb);
|
||||
} else {
|
||||
dev_warn(fep->dev,
|
||||
"Memory squeeze, dropping packet.\n");
|
||||
fep->stats.rx_dropped++;
|
||||
skbn = skb;
|
||||
}
|
||||
@@ -309,8 +307,6 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
|
||||
received++;
|
||||
netif_rx(skb);
|
||||
} else {
|
||||
dev_warn(fep->dev,
|
||||
"Memory squeeze, dropping packet.\n");
|
||||
fep->stats.rx_dropped++;
|
||||
skbn = skb;
|
||||
}
|
||||
@@ -505,11 +501,9 @@ void fs_init_bds(struct net_device *dev)
|
||||
*/
|
||||
for (i = 0, bdp = fep->rx_bd_base; i < fep->rx_ring; i++, bdp++) {
|
||||
skb = netdev_alloc_skb(dev, ENET_RX_FRSIZE);
|
||||
if (skb == NULL) {
|
||||
dev_warn(fep->dev,
|
||||
"Memory squeeze, unable to allocate skb\n");
|
||||
if (skb == NULL)
|
||||
break;
|
||||
}
|
||||
|
||||
skb_align(skb, ENET_RX_ALIGN);
|
||||
fep->rx_skbuff[i] = skb;
|
||||
CBDW_BUFADDR(bdp,
|
||||
@@ -593,13 +587,8 @@ static struct sk_buff *tx_skb_align_workaround(struct net_device *dev,
|
||||
|
||||
/* Alloc new skb */
|
||||
new_skb = netdev_alloc_skb(dev, skb->len + 4);
|
||||
if (!new_skb) {
|
||||
if (net_ratelimit()) {
|
||||
dev_warn(fep->dev,
|
||||
"Memory squeeze, dropping tx packet.\n");
|
||||
}
|
||||
if (!new_skb)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Make sure new skb is properly aligned */
|
||||
skb_align(new_skb, 4);
|
||||
|
Reference in New Issue
Block a user