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

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

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

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+3 −4
Original line number Diff line number Diff line
@@ -445,15 +445,14 @@ static void fm10k_type_trans(struct fm10k_ring *rx_ring, 
			l2_accel = NULL;

	}



	skb->protocol = eth_type_trans(skb, dev);



	/* Record Rx queue, or update macvlan statistics */

	if (!l2_accel)

		skb_record_rx_queue(skb, rx_ring->queue_index);

	else

		macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true,

				 (skb->pkt_type == PACKET_BROADCAST) ||

				 (skb->pkt_type == PACKET_MULTICAST));

				 false);



	skb->protocol = eth_type_trans(skb, dev);

}



/**

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −4
Original line number Diff line number Diff line
@@ -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))

		ixgbe_ipsec_rx(rx_ring, rx_desc, skb);



	skb->protocol = eth_type_trans(skb, dev);



	/* record Rx queue, or update MACVLAN statistics */

	if (netif_is_ixgbe(dev))

		skb_record_rx_queue(skb, rx_ring->queue_index);

	else

		macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true,

				 (skb->pkt_type == PACKET_BROADCAST) ||

				 (skb->pkt_type == PACKET_MULTICAST));

				 false);



	skb->protocol = eth_type_trans(skb, dev);

}



static void ixgbe_rx_skb(struct ixgbe_q_vector *q_vector,