You need to sign in or sign up before continuing.
提交 661b2067 编写于 作者: J Jeff Kirsher

fm10k: allow creation of VLAN on default vid

Previously, the user was not allowed to create a VLAN interface on top
of the switch default vid.
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: NJacob Keller <jacob.e.keller@intel.com>
Acked-by: NMatthew Vick <matthew.vick@intel.com>
Tested-by: NKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
上级 de445199
......@@ -770,15 +770,15 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
if (hw->mac.vlan_override)
return -EACCES;
/* if default VLAN is already present do nothing */
if (vid == hw->mac.default_vid)
return -EBUSY;
/* update active_vlans bitmask */
set_bit(vid, interface->active_vlans);
if (!set)
clear_bit(vid, interface->active_vlans);
/* if default VLAN is already present do nothing */
if (vid == hw->mac.default_vid)
return 0;
fm10k_mbx_lock(interface);
/* only need to update the VLAN if not in promiscuous mode */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册