1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index bf44a8fe711f..8811364b91cb 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -20,9 +20,9 @@
 
 #include "fm10k.h"
 #include <linux/vmalloc.h>
-#if IS_ENABLED(CONFIG_VXLAN)
+#if IS_ENABLED(CONFIG_FM10K_VXLAN)
 #include <net/vxlan.h>
-#endif /* CONFIG_VXLAN */
+#endif /* CONFIG_FM10K_VXLAN */
 
 /**
  * fm10k_setup_tx_resources - allocate Tx resources (Descriptors)
@@ -556,7 +556,7 @@ int fm10k_open(struct net_device *netdev)
         if (err)
                 goto err_set_queues;
 
-#if IS_ENABLED(CONFIG_VXLAN)
+#if IS_ENABLED(CONFIG_FM10K_VXLAN)
         /* update VXLAN port configuration */
         vxlan_get_rx_port(netdev);
 
@@ -785,14 +785,14 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
         if (!(netdev->flags & IFF_PROMISC)) {
                 err = hw->mac.ops.update_vlan(hw, vid, 0, set);
                 if (err)
-                        return err;
+                        goto err_out;
         }
 
         /* update our base MAC address */
         err = hw->mac.ops.update_uc_addr(hw, interface->glort, hw->mac.addr,
                                          vid, set, 0);
         if (err)
-                return err;
+                goto err_out;
 
         /* set vid prior to syncing/unsyncing the VLAN */
         interface->vid = vid + (set ? VLAN_N_VID : 0);
@@ -801,9 +801,10 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
         __dev_uc_unsync(netdev, fm10k_uc_vlan_unsync);
         __dev_mc_unsync(netdev, fm10k_mc_vlan_unsync);
 
+err_out:
         fm10k_mbx_unlock(interface);
 
-        return 0;
+        return err;
 }
 
 static int fm10k_vlan_rx_add_vid(struct net_device *netdev,