Merge "net: bridge: Fix merge error" (868eda7e) · Commits · e / devices / android_kernel_xiaomi_nabu

net/bridge/br_device.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -48,14 +48,8 @@ netdev_tx_t br_dev_xmit(struct sk_buff skb, struct net_device dev)
		return NETDEV_TX_OK;
		}

		BR_INPUT_SKB_CB(skb)->brdev = dev;

		skb_reset_mac_header(skb);
		skb_pull(skb, ETH_HLEN);

		u64_stats_update_begin(&brstats->syncp);
		brstats->tx_packets++;
		/* Exclude ETH_HLEN from byte stats for consistency with Rx chain */
		brstats->tx_bytes += skb->len;
		u64_stats_update_end(&brstats->syncp);