]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
i40e: Hide the Port VLAN VLAN ID
authorGreg Rose <gregory.v.rose@intel.com>
Thu, 28 Nov 2013 06:39:44 +0000 (06:39 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 6 Jan 2014 11:15:17 +0000 (03:15 -0800)
The VF VSI Port VLAN settings still allow the user to view VLAN tag in
the descriptor.  Fix the settings to hide the VLAN ID from the VF. The
VF is not supposed to be aware it is on a VLAN in the Port VLAN
scenario.

Change-Id: I976f2bacb455dbb750f8c53a781c689f02cb8907
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 40484e012637ca0a54052cd93927e391d1982c75..9c16aa8194bb7416c60f741e63181f5fd8dacddd 100644 (file)
@@ -2018,7 +2018,7 @@ int i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid)
        vsi->info.pvid = cpu_to_le16(vid);
        vsi->info.port_vlan_flags = I40E_AQ_VSI_PVLAN_MODE_TAGGED |
                                    I40E_AQ_VSI_PVLAN_INSERT_PVID |
-                                   I40E_AQ_VSI_PVLAN_EMOD_STR_BOTH;
+                                   I40E_AQ_VSI_PVLAN_EMOD_STR;
 
        ctxt.seid = vsi->seid;
        memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));