aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/i40e
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2015-03-31 03:45:01 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-04-03 06:54:29 -0400
commit8b6ed9c202c0c7c179ab7a6cf8010ff0b63d2d4f (patch)
tree7fdccc680c9de6f6d1f68112e56702f6d1644840 /drivers/net/ethernet/intel/i40e
parent1a2f62489b5dc15bd2aadb1de2e38f732e2c4553 (diff)
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>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_txrx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 9b11f2e7e361..5a1a67733b88 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1565,8 +1565,11 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)
1565 if (likely(!skb)) { 1565 if (likely(!skb)) {
1566 skb = netdev_alloc_skb_ip_align(rx_ring->netdev, 1566 skb = netdev_alloc_skb_ip_align(rx_ring->netdev,
1567 rx_ring->rx_hdr_len); 1567 rx_ring->rx_hdr_len);
1568 if (!skb) 1568 if (!skb) {
1569 rx_ring->rx_stats.alloc_buff_failed++; 1569 rx_ring->rx_stats.alloc_buff_failed++;
1570 break;
1571 }
1572
1570 /* initialize queue mapping */ 1573 /* initialize queue mapping */
1571 skb_record_rx_queue(skb, rx_ring->queue_index); 1574 skb_record_rx_queue(skb, rx_ring->queue_index);
1572 /* we are reusing so sync this buffer for CPU use */ 1575 /* we are reusing so sync this buffer for CPU use */