aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/fm10k/fm10k_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/fm10k/fm10k_main.c')
-rw-r--r--drivers/net/ethernet/intel/fm10k/fm10k_main.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 538b42d5c187..8e12aae065d8 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -446,13 +446,13 @@ static void fm10k_type_trans(struct fm10k_ring *rx_ring,
446 446
447 skb->protocol = eth_type_trans(skb, dev); 447 skb->protocol = eth_type_trans(skb, dev);
448 448
449 /* Record Rx queue, or update macvlan statistics */
449 if (!l2_accel) 450 if (!l2_accel)
450 return; 451 skb_record_rx_queue(skb, rx_ring->queue_index);
451 452 else
452 /* update MACVLAN statistics */ 453 macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true,
453 macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, 1, 454 (skb->pkt_type == PACKET_BROADCAST) ||
454 !!(rx_desc->w.hdr_info & 455 (skb->pkt_type == PACKET_MULTICAST));
455 cpu_to_le16(FM10K_RXD_HDR_INFO_XC_MASK)));
456} 456}
457 457
458/** 458/**
@@ -479,8 +479,6 @@ static unsigned int fm10k_process_skb_fields(struct fm10k_ring *rx_ring,
479 479
480 FM10K_CB(skb)->fi.w.vlan = rx_desc->w.vlan; 480 FM10K_CB(skb)->fi.w.vlan = rx_desc->w.vlan;
481 481
482 skb_record_rx_queue(skb, rx_ring->queue_index);
483
484 FM10K_CB(skb)->fi.d.glort = rx_desc->d.glort; 482 FM10K_CB(skb)->fi.d.glort = rx_desc->d.glort;
485 483
486 if (rx_desc->w.vlan) { 484 if (rx_desc->w.vlan) {