diff options
| author |   Jesse Brandeburg <jesse.brandeburg@intel.com> | 2015-09-28 11:21:48 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-09-28 20:56:58 -0700 |
| commit | c4bbac3913c0d649898a0d767728a585869a7d7d (patch) | |
| tree | 0c3ddbf9a1404adab78363422e26a68c1625f6f8 /drivers/net | |
| parent | r8169: fix handling rtl_readphy result (diff) | |
| download | linux-dev-c4bbac3913c0d649898a0d767728a585869a7d7d.tar.xz linux-dev-c4bbac3913c0d649898a0d767728a585869a7d7d.zip | |
i40e: fix VLAN inside VXLAN
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>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 851c1a159be8..2fdf978ae6a5 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -2672,7 +2672,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 |