1 files changed, 23 insertions, 26 deletions

diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index 5e7ed225851a..293ff06ba16f 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -146,37 +146,34 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
                 adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
                 if (!netdev_get_num_tc(netdev))
                         ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);
-
-                ixgbe_init_interrupt_scheme(adapter);
-                if (netif_running(netdev))
-                        netdev->netdev_ops->ndo_open(netdev);
         } else {
                 /* Turn off DCB */
-                if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        if (netif_running(netdev))
-                                netdev->netdev_ops->ndo_stop(netdev);
-                        ixgbe_clear_interrupt_scheme(adapter);
+                if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
+                        goto out;
 
-                        adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
-                        adapter->temp_dcb_cfg.pfc_mode_enable = false;
-                        adapter->dcb_cfg.pfc_mode_enable = false;
-                        adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
-                        switch (adapter->hw.mac.type) {
-                        case ixgbe_mac_82599EB:
-                        case ixgbe_mac_X540:
-                                adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
-                                break;
-                        default:
-                                break;
-                        }
-
-                        ixgbe_setup_tc(netdev, 0);
-
-                        ixgbe_init_interrupt_scheme(adapter);
-                        if (netif_running(netdev))
-                                netdev->netdev_ops->ndo_open(netdev);
+                if (netif_running(netdev))
+                        netdev->netdev_ops->ndo_stop(netdev);
+                ixgbe_clear_interrupt_scheme(adapter);
+
+                adapter->hw.fc.requested_mode = adapter->last_lfc_mode;
+                adapter->temp_dcb_cfg.pfc_mode_enable = false;
+                adapter->dcb_cfg.pfc_mode_enable = false;
+                adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
+                switch (adapter->hw.mac.type) {
+                case ixgbe_mac_82599EB:
+                case ixgbe_mac_X540:
+                        adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
+                        break;
+                default:
+                        break;
                 }
+
+                ixgbe_setup_tc(netdev, 0);
         }
+
+        ixgbe_init_interrupt_scheme(adapter);
+        if (netif_running(netdev))
+                netdev->netdev_ops->ndo_open(netdev);
 out:
         return err;
 }