Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c3d5a96 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: drivers/net: Remove unnecessary skb_copy_expand OOM messages 



skb_copy_expand without __GFP_NOWARN already does a dump_stack
on OOM so these messages are redundant.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80d9f3a0

drivers/net/ethernet/qualcomm/qca_spi.c

+0 −1
Original line number Diff line number Diff line
@@ -705,7 +705,6 @@ qcaspi_netdev_xmit(struct sk_buff *skb, struct net_device *dev) 
		tskb = skb_copy_expand(skb, QCAFRM_HEADER_LEN,

				       QCAFRM_FOOTER_LEN + pad_len, GFP_ATOMIC);

		if (!tskb) {

			netdev_dbg(qca->net_dev, "could not allocate tx_buff\n");

			qca->stats.out_of_mem++;

			return NETDEV_TX_BUSY;

		}

drivers/net/usb/lg-vl600.c

+1 −5
Original line number Diff line number Diff line
@@ -157,12 +157,8 @@ static int vl600_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 


		s->current_rx_buf = skb_copy_expand(skb, 0,

				le32_to_cpup(&frame->len), GFP_ATOMIC);

		if (!s->current_rx_buf) {

			netif_err(dev, ifup, dev->net, "Reserving %i bytes "

					"for packet assembly failed.\n",

					le32_to_cpup(&frame->len));

		if (!s->current_rx_buf)

			dev->net->stats.rx_errors++;

		}



		return 0;

	}

drivers/net/wimax/i2400m/usb-rx.c

+0 −3
Original line number Diff line number Diff line
@@ -263,9 +263,6 @@ struct sk_buff *i2400mu_rx(struct i2400mu *i2400mu, struct sk_buff *rx_skb) 
		new_skb = skb_copy_expand(rx_skb, 0, rx_size - rx_skb->len,

					  GFP_KERNEL);

		if (new_skb == NULL) {

			if (printk_ratelimit())

				dev_err(dev, "RX: Can't reallocate skb to %d; "

					"RX dropped\n", rx_size);

			kfree_skb(rx_skb);

			rx_skb = NULL;

			goto out;	/* drop it...*/

drivers/net/wireless/ti/wl1251/tx.c

+1 −3
Original line number Diff line number Diff line
@@ -221,10 +221,8 @@ static int wl1251_tx_send_packet(struct wl1251 *wl, struct sk_buff *skb, 
			struct sk_buff *newskb = skb_copy_expand(skb, 0, 3,

								 GFP_KERNEL);



			if (unlikely(newskb == NULL)) {

				wl1251_error("Can't allocate skb!");

			if (unlikely(newskb == NULL))

				return -EINVAL;

			}



			tx_hdr = (struct tx_double_buffer_desc *) newskb->data;

drivers/usb/gadget/function/f_eem.c

+0 −1
Original line number Diff line number Diff line
@@ -507,7 +507,6 @@ static int eem_unwrap(struct gether *port, 
						0,

						GFP_ATOMIC);

			if (unlikely(!skb3)) {

				DBG(cdev, "unable to realign EEM packet\n");

				dev_kfree_skb_any(skb2);

				continue;

			}