mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 16:37:50 +00:00
Code Issues Releases Wiki Activity

arcnet: Remove unnecessary OOM messages

Browse source 
Alloc failures have generic stack dumps so these are redundant.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
This commit is contained in:
Joe Perches 2015-05-05 10:05:58 -07:00 committed by Michael Grzeschik
parent 811eafc02e
commit 5628d98fc5
5 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/arcnet/arc-rawmode.c
View file

@ -98,7 +98,6 @@ static void rx(struct net_device *dev, int bufnum,
skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
if (skb == NULL) {
arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
dev->stats.rx_dropped++;
return;
}

5
drivers/net/arcnet/capmode.c
View file

@ -57,7 +57,6 @@ static void rx(struct net_device *dev, int bufnum,
skb = alloc_skb(length + ARC_HDR_SIZE + sizeof(int), GFP_ATOMIC);
if (skb == NULL) {
arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
dev->stats.rx_dropped++;
return;
}
@ -197,10 +196,8 @@ static int ack_tx(struct net_device *dev, int acked)
/* Now alloc a skb to send back up through the layers: */
ackskb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
if (ackskb == NULL) {
arc_printk(D_NORMAL, dev, "Memory squeeze, can't acknowledge\n");
if (ackskb == NULL)
goto free_outskb;
}
skb_put(ackskb, length + ARC_HDR_SIZE);
ackskb->dev = dev;

4
drivers/net/arcnet/com20020-pci.c
View file

@ -142,10 +142,8 @@ static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
card = devm_kzalloc(&pdev->dev, sizeof(struct com20020_dev),
GFP_KERNEL);
if (!card) {
pr_err("%s out of memory!\n", __func__);
if (!card)
return -ENOMEM;
}
card->index = i;
card->pci_priv = priv;

1
drivers/net/arcnet/rfc1051.c
View file

@ -134,7 +134,6 @@ static void rx(struct net_device *dev, int bufnum,
skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
if (skb == NULL) {
arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
dev->stats.rx_dropped++;
return;
}

1
drivers/net/arcnet/rfc1201.c
View file

@ -179,7 +179,6 @@ static void rx(struct net_device *dev, int bufnum,
skb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
if (skb == NULL) {
arc_printk(D_NORMAL, dev, "Memory squeeze, dropping packet\n");
dev->stats.rx_dropped++;
return;
}