diff options
| author | John Allen <jallen@linux.vnet.ibm.com> | 2018-02-09 13:19:46 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-09 14:47:00 -0500 |
| commit | 2fa56a494484f19e06bf4f3464b2155a92beafac (patch) | |
| tree | 38c548bd82b9846c8ef039ce2569b69c07ffcb8c | |
| parent | 941ff6f11c020913f5cddf543a9ec63475d7c082 (diff) | |
| download | linux-stable-2fa56a494484f19e06bf4f3464b2155a92beafac.tar.gz linux-stable-2fa56a494484f19e06bf4f3464b2155a92beafac.tar.bz2 linux-stable-2fa56a494484f19e06bf4f3464b2155a92beafac.zip | |
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 <jallen@linux.vnet.ibm.com>
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index ce127a72cda2..27447260215d 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; |