Re: [net] i40e: fix VLAN inside VXLAN

[David Miller]

From: Jeff Kirsher 
Date: Mon, 28 Sep 2015 11:21:48 -0700

> From: Jesse Brandeburg 
> 
> Previously to this patch, the hardware was removing
> VLAN tags from the inner header of VXLAN packets.  The
> hardware configuration can be changed to leave the
> packet alone since that is what the linux stack
> expects for this type of VLAN in VXLAN packet.
> 
> Signed-off-by: Jesse Brandeburg 
> Tested-by: Andrew Bowers 
> Signed-off-by: Jeff Kirsher 

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[net] i40e: fix VLAN inside VXLAN

[Jeff Kirsher]

From: Jesse Brandeburg 

Previously to this patch, the hardware was removing
VLAN tags from the inner header of VXLAN packets.  The
hardware configuration can be changed to leave the
packet alone since that is what the linux stack
expects for this type of VLAN in VXLAN packet.

Signed-off-by: Jesse Brandeburg 
Tested-by: Andrew Bowers 
Signed-off-by: Jeff Kirsher 
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c 
b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 48a52b3..5bb1e67 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -2590,7 +2590,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)
rx_ctx.lrxqthresh = 2;
rx_ctx.crcstrip = 1;
rx_ctx.l2tsel = 1;
-   rx_ctx.showiv = 1;
+   /* this controls whether VLAN is stripped from inner headers */
+   rx_ctx.showiv = 0;
 #ifdef I40E_FCOE
rx_ctx.fc_ena = (vsi->type == I40E_VSI_FCOE);
 #endif
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html