Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fcd86b5 authored by John Fastabend's avatar John Fastabend Committed by Jeff Kirsher
Browse files

ixgbe: dcbnl reduce duplicated code and indentation 



Replace duplicated code in if/else branches with single
check and ixgbe_init_interrupt_scheme().

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c12db769

drivers/net/ixgbe/ixgbe_dcb_nl.c

+23 −26
Original line number Original line Diff line number Diff line
@@ -146,13 +146,11 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) 
		adapter->flags |= IXGBE_FLAG_DCB_ENABLED;

		adapter->flags |= IXGBE_FLAG_DCB_ENABLED;

		if (!netdev_get_num_tc(netdev))

		if (!netdev_get_num_tc(netdev))

			ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);

			ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);



		ixgbe_init_interrupt_scheme(adapter);

		if (netif_running(netdev))

			netdev->netdev_ops->ndo_open(netdev);

	} else {

	} else {

		/* Turn off DCB */

		/* Turn off DCB */

		if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {

		if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED))

			goto out;



		if (netif_running(netdev))

		if (netif_running(netdev))

			netdev->netdev_ops->ndo_stop(netdev);

			netdev->netdev_ops->ndo_stop(netdev);

		ixgbe_clear_interrupt_scheme(adapter);

		ixgbe_clear_interrupt_scheme(adapter);
@@ -171,12 +169,11 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) 
		}

		}





		ixgbe_setup_tc(netdev, 0);

		ixgbe_setup_tc(netdev, 0);

	}





	ixgbe_init_interrupt_scheme(adapter);

	ixgbe_init_interrupt_scheme(adapter);

	if (netif_running(netdev))

	if (netif_running(netdev))

		netdev->netdev_ops->ndo_open(netdev);

		netdev->netdev_ops->ndo_open(netdev);

		}

	}

out:

out:

	return err;

	return err;

}

}