[Intel-wired-lan] [net PATCH V1] i40e: fix vlan inside vxlan

[Intel-wired-lan] [net PATCH V1] i40e: fix vlan inside vxlan

[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 <jesse.brandeburg@intel.com>
---
 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 9295768..3410fb3 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -2613,7 +2613,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

[Intel-wired-lan] [net PATCH V1] i40e: fix vlan inside vxlan

[Jeff Kirsher]

On Tue, 2015-09-22 at 11:34 -0700, Jesse Brandeburg wrote:
> 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 <jesse.brandeburg@intel.com>
> ---
>  drivers/net/ethernet/intel/i40e/i40e_main.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

CC: stable <stable@vger.kernel.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20150924/f5f12e8b/attachment-0001.asc>