[Intel-wired-lan] [net-next 07/25] fm10k: allow creation of VLAN on default vid

[Alexander Duyck]

On 04/03/2015 01:26 PM, Jeff Kirsher wrote:
> Previously, the user was not allowed to create a VLAN interface on top
> of the switch default vid.
>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
> Signed-off-by: Jacob Keller <jacob.e.keller at intel.com>
> Acked-by: Matthew Vick <matthew.vick at intel.com>
> ---
>  drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
> index 2a61b83..c9f87bb 100644
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
> @@ -770,10 +770,6 @@ 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)

Instead of removing this it should probably just return 0 and move it
down a few lines after setting or clearing the bit.  Otherwise you will
strip the default VLAN on removal and I am pretty sure that will disable
all receives until the interface is reset and restores VLAN 0 from the
VF which maps to the default VLAN.

- Alex