Commit b183c302 authored Jul 17, 2018 by Subash Abhinov Kasiviswanathan Committed by Gerrit - the friendly Code Review server Jul 18, 2018

net: bridge: Fix merge error



skb pull was being done twice which was causing a wrong packet
offset being set for packets being sent through the bridge driver.

CRs-Fixed: 2281120
Change-Id: I9a4fc0216a5dc0806266ed75ae64f54190172aaf
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

parent b9c29f3b

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);