diff options
| author |   Stefan Assmann <sassmann@kpanic.de> | 2013-12-11 22:10:12 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-03-19 21:38:54 -0700 |
| commit | dc1edc67fe2da3d87b56cdffd5ef55c3a9af252c (patch) | |
| tree | 0cc15090354198781e4da9ea12e65c774a74567e /drivers/net/ethernet/intel/igb/e1000_regs.h | |
| parent | qeth: Fix IP version detection for VLAN traffic (diff) | |
| download | linux-dev-dc1edc67fe2da3d87b56cdffd5ef55c3a9af252c.tar.xz linux-dev-dc1edc67fe2da3d87b56cdffd5ef55c3a9af252c.zip | |
igb: enable VLAN stripping for VMs with i350
For i350 VLAN stripping for VMs is not enabled in the VMOLR register but in
the DVMOLR register. Making the changes accordingly. It's not necessary to
unset the E1000_VMOLR_STRVLAN bit on i350 as the hardware will simply ignore
it.
Without this change if a VLAN is configured for a VF assigned to a guest
via (i.e.)
ip link set p1p1 vf 0 vlan 10
the VLAN tag will not be stripped from packets going into the VM. Which they
should be because the VM itself is not aware of the VLAN at all.
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_regs.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h index e9c5fdd60f54..d0f14be3d94f 100644 --- a/drivers/net/ethernet/intel/igb/e1000_regs.h +++ b/drivers/net/ethernet/intel/igb/e1000_regs.h @@ -357,6 +357,7 @@ #define E1000_P2VMAILBOX(_n) (0x00C00 + (4 * (_n))) #define E1000_VMBMEM(_n) (0x00800 + (64 * (_n))) #define E1000_VMOLR(_n) (0x05AD0 + (4 * (_n))) +#define E1000_DVMOLR(_n) (0x0C038 + (64 * (_n))) #define E1000_VLVF(_n) (0x05D00 + (4 * (_n))) /* VLAN Virtual Machine * Filter - RW */ #define E1000_VMVIR(_n) (0x03700 + (4 * (_n))) |