From: John Allen Date: Fri, 9 Feb 2018 19:19:46 +0000 (-0600) Subject: ibmvnic: Remove skb->protocol checks in ibmvnic_xmit X-Git-Tag: v4.19~1593^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fa56a494484f19e06bf4f3464b2155a92beafac;p=platform%2Fkernel%2Flinux-rpi3.git ibmvnic: Remove skb->protocol checks in ibmvnic_xmit Having these checks in ibmvnic_xmit causes problems with VLAN tagging and balance-alb/tlb bonding modes. The restriction they imposed can be removed. Signed-off-by: John Allen Signed-off-by: Nathan Fontenot Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index ce127a7..2744726 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1419,10 +1419,7 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) hdrs += 2; } /* determine if l2/3/4 headers are sent to firmware */ - if ((*hdrs >> 7) & 1 && - (skb->protocol == htons(ETH_P_IP) || - skb->protocol == htons(ETH_P_IPV6) || - skb->protocol == htons(ETH_P_ARP))) { + if ((*hdrs >> 7) & 1) { build_hdr_descs_arr(tx_buff, &num_entries, *hdrs); tx_crq.v1.n_crq_elem = num_entries; tx_buff->indir_arr[0] = tx_crq;