From: Jacob Keller Date: Fri, 19 Jun 2015 17:56:09 +0000 (-0700) Subject: fm10k: allow creation of VLAN interfaces even while down X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~5645^2~330^2~8 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3f0bdb2e2ce7db7425856686d9ccd8fd0ddf9bf0;p=mirror_ubuntu-zesty-kernel.git fm10k: allow creation of VLAN interfaces even while down We re-sync upon going up, so there is little reason to worry about not syncing immediately with switch. This prevents an error that occurs if you add a VLAN interface while down. Signed-off-by: Jacob Keller Tested-by: Krishneil Singh Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c index b2065cb44edc..e1ceb3a2e2cd 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c @@ -779,6 +779,12 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set) if (!set && vid == hw->mac.default_vid) return 0; + /* Do not throw an error if the interface is down. We will sync once + * we come up + */ + if (test_bit(__FM10K_DOWN, &interface->state)) + return 0; + fm10k_mbx_lock(interface); /* only need to update the VLAN if not in promiscuous mode */