diff mbox series

ibmvnic: Remove skb->protocol checks in ibmvnic_xmit

Message ID 151820337461.54278.5008284319777707694.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com
State Changes Requested, archived
Delegated to: David Miller
Headers show
Series ibmvnic: Remove skb->protocol checks in ibmvnic_xmit | expand

Commit Message

Nathan Fontenot Feb. 9, 2018, 7:09 p.m. UTC 
From: John Allen (jallen@linux.vnet.ibm.com>

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: Nathan Fontenot <nfont@linux.vnet.ibm.com>
---
 drivers/net/ethernet/ibm/ibmvnic.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Jakub Kicinski Feb. 9, 2018, 7:32 p.m. UTC | #1 
On Fri, 09 Feb 2018 13:09:34 -0600, Nathan Fontenot wrote:
> From: John Allen (jallen@linux.vnet.ibm.com>

Nit: s/(/</

> 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: Nathan Fontenot <nfont@linux.vnet.ibm.com>

Patch does not have author's SoB line, the kernel bots will complain
about this, so please add it if it's not a problem.
Nathan Fontenot Feb. 9, 2018, 7:33 p.m. UTC | #2 
On 02/09/2018 01:32 PM, Jakub Kicinski wrote:
> On Fri, 09 Feb 2018 13:09:34 -0600, Nathan Fontenot wrote:
>> From: John Allen (jallen@linux.vnet.ibm.com>
> 
> Nit: s/(/</
> 
>> 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: Nathan Fontenot <nfont@linux.vnet.ibm.com>
> 
> Patch does not have author's SoB line, the kernel bots will complain
> about this, so please add it if it's not a problem.
> 

Oops. Thanks for pointing this out, I'll re-send.

-Nathan
diff mbox series

Patch

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 5caaa9033841..f276c6dcb4a9 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1414,10 +1414,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;