Merge "net: macsec: count RX bytes/packets when offloaded" (5b3e7f14) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/net/macsec.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -934,11 +934,15 @@ static enum rx_handler_result handle_not_macsec(struct sk_buff *skb)
		* SecTAG, so we have to deduce which port to deliver to.
		*/
		if (macsec_get_ops(macsec, NULL) && netif_running(ndev)) {
		if (hdr->h_proto == htons(ETH_P_PAE))
		continue;

		if (ndev->flags & IFF_PROMISC) {
		nskb = skb_clone(skb, GFP_ATOMIC);
		if (!nskb)
		break;

		count_rx(ndev, nskb->len);
		nskb->dev = ndev;
		netif_rx(nskb);
		} else if (ether_addr_equal_64bits(hdr->h_dest,
		@@ -946,6 +950,7 @@ static enum rx_handler_result handle_not_macsec(struct sk_buff *skb)
		/* HW offload enabled, divert skb */
		skb->dev = ndev;
		skb->pkt_type = PACKET_HOST;
		count_rx(ndev, skb->len);
		ret = RX_HANDLER_ANOTHER;
		goto out;
		} else if (is_multicast_ether_addr_64bits(hdr->h_dest)) {
		@@ -960,6 +965,7 @@ static enum rx_handler_result handle_not_macsec(struct sk_buff *skb)
		else
		nskb->pkt_type = PACKET_MULTICAST;

		count_rx(ndev, nskb->len);
		netif_rx(nskb);
		}
		continue;