Commit 8d80ac43 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher

ixgbe/fm10k: Drop tracking stats for macvlan broadcast/multicast

Drop dead code now that we shouldn't be receiving broadcast or multicast
frames on the queues associated to the macvlan netdev.
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 81d4e91c
...@@ -445,15 +445,14 @@ static void fm10k_type_trans(struct fm10k_ring *rx_ring, ...@@ -445,15 +445,14 @@ static void fm10k_type_trans(struct fm10k_ring *rx_ring,
l2_accel = NULL; l2_accel = NULL;
} }
skb->protocol = eth_type_trans(skb, dev);
/* Record Rx queue, or update macvlan statistics */ /* Record Rx queue, or update macvlan statistics */
if (!l2_accel) if (!l2_accel)
skb_record_rx_queue(skb, rx_ring->queue_index); skb_record_rx_queue(skb, rx_ring->queue_index);
else else
macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true, macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true,
(skb->pkt_type == PACKET_BROADCAST) || false);
(skb->pkt_type == PACKET_MULTICAST));
skb->protocol = eth_type_trans(skb, dev);
} }
/** /**
......
...@@ -1768,15 +1768,14 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring, ...@@ -1768,15 +1768,14 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring,
if (ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_SECP)) if (ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_SECP))
ixgbe_ipsec_rx(rx_ring, rx_desc, skb); ixgbe_ipsec_rx(rx_ring, rx_desc, skb);
skb->protocol = eth_type_trans(skb, dev);
/* record Rx queue, or update MACVLAN statistics */ /* record Rx queue, or update MACVLAN statistics */
if (netif_is_ixgbe(dev)) if (netif_is_ixgbe(dev))
skb_record_rx_queue(skb, rx_ring->queue_index); skb_record_rx_queue(skb, rx_ring->queue_index);
else else
macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true, macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true,
(skb->pkt_type == PACKET_BROADCAST) || false);
(skb->pkt_type == PACKET_MULTICAST));
skb->protocol = eth_type_trans(skb, dev);
} }
static void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector, static void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment