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

Commit 8b6ed9c2 authored Mar 31, 2015 by Jesse Brandeburg Committed by Jeff Kirsher Apr 03, 2015

i40e/i40evf: fix bug when skb allocation fails



If the skb allocation fails we should not continue using the skb
pointer.  Breaking out at the point of failure means that at the next
RX interrupt the driver will try the allocation again.

Change-ID: Iefaad69856ced7418bfd92afe55322676341f82e
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 1a2f6248

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1565,8 +1565,11 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)
		if (likely(!skb)) {
		skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
		rx_ring->rx_hdr_len);
		if (!skb)
		if (!skb) {
		rx_ring->rx_stats.alloc_buff_failed++;
		break;
		}

		/* initialize queue mapping */
		skb_record_rx_queue(skb, rx_ring->queue_index);
		/* we are reusing so sync this buffer for CPU use */

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1040,8 +1040,11 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)
		if (likely(!skb)) {
		skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
		rx_ring->rx_hdr_len);
		if (!skb)
		if (!skb) {
		rx_ring->rx_stats.alloc_buff_failed++;
		break;
		}

		/* initialize queue mapping */
		skb_record_rx_queue(skb, rx_ring->queue_index);
		/* we are reusing so sync this buffer for CPU use */