Commit 2fa56a49 authored by John Allen's avatar John Allen Committed by David S. Miller
Browse files

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: default avatarJohn Allen <jallen@linux.vnet.ibm.com>
Signed-off-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 941ff6f1

drivers/net/ethernet/ibm/ibmvnic.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE