1 files changed, 4 insertions, 42 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index da6d53e7af99..0422e356b6fc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -118,49 +118,11 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
         if (!!state != !(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
                 return err;
 
-        if (state > 0) {
-                /* Turn on DCB */
-                if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
-                        e_err(drv, "Enable failed, needs MSI-X\n");
-                        err = 1;
-                        goto out;
-                }
-
-                adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
-
-                switch (adapter->hw.mac.type) {
-                case ixgbe_mac_82598EB:
-                        adapter->last_lfc_mode = adapter->hw.fc.current_mode;
-                        adapter->hw.fc.requested_mode = ixgbe_fc_none;
-                        break;
-                case ixgbe_mac_82599EB:
-                case ixgbe_mac_X540:
-                        adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
-                        break;
-                default:
-                        break;
-                }
-
-                ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);
-        } else {
-                /* Turn off DCB */
-                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:
-                        if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
-                                adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;
-                        break;
-                default:
-                        break;
-                }
-                ixgbe_setup_tc(netdev, 0);
-        }
+        if (state > 0)
+                err = ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);
+        else
+                err = ixgbe_setup_tc(netdev, 0);
 
-out:
         return err;
 }