aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 165bfa600b4b..2c70fa0add3e 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -461,6 +461,7 @@ static int __ixgbe_notify_dca(struct device *dev, void *data)
461 **/ 461 **/
462static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector, 462static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
463 struct sk_buff *skb, u8 status, 463 struct sk_buff *skb, u8 status,
464 struct ixgbe_ring *ring,
464 union ixgbe_adv_rx_desc *rx_desc) 465 union ixgbe_adv_rx_desc *rx_desc)
465{ 466{
466 struct ixgbe_adapter *adapter = q_vector->adapter; 467 struct ixgbe_adapter *adapter = q_vector->adapter;
@@ -468,7 +469,7 @@ static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
468 bool is_vlan = (status & IXGBE_RXD_STAT_VP); 469 bool is_vlan = (status & IXGBE_RXD_STAT_VP);
469 u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); 470 u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
470 471
471 skb_record_rx_queue(skb, q_vector->v_idx); 472 skb_record_rx_queue(skb, ring->queue_index);
472 if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) { 473 if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) {
473 if (adapter->vlgrp && is_vlan && (tag != 0)) 474 if (adapter->vlgrp && is_vlan && (tag != 0))
474 vlan_gro_receive(napi, adapter->vlgrp, tag, skb); 475 vlan_gro_receive(napi, adapter->vlgrp, tag, skb);
@@ -782,7 +783,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
782 total_rx_packets++; 783 total_rx_packets++;
783 784
784 skb->protocol = eth_type_trans(skb, adapter->netdev); 785 skb->protocol = eth_type_trans(skb, adapter->netdev);
785 ixgbe_receive_skb(q_vector, skb, staterr, rx_desc); 786 ixgbe_receive_skb(q_vector, skb, staterr, rx_ring, rx_desc);
786 787
787next_desc: 788next_desc:
788 rx_desc->wb.upper.status_error = 0; 789 rx_desc->wb.upper.status_error = 0;