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

Commit 3ce1cc52 authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

ixgbe: if ixgbe_copy_dcb_cfg is going to fail learn about it early 



Call ixgbe_copy_dcb_cfg() earlier in the ixgbe_dcbnl_set_all() so that
we can learn if this is going to fail as early as possible.  Previously,
ixgbe_down or ixgbe_close were being called before this check and the
IXGBE_RESETTING bit was being set and cleared.  Worse if this failed
the corresponding ixgbe_up/ndo_open would not called.

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Acked-by: default avatarPJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebe1b30c

drivers/net/ixgbe/ixgbe_dcb_nl.c

+6 −8
Original line number Diff line number Diff line
@@ -341,6 +341,12 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) 
	if (!adapter->dcb_set_bitmap)

		return DCB_NO_HW_CHG;



	ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,

				 adapter->ring_feature[RING_F_DCB].indices);



	if (ret)

		return DCB_NO_HW_CHG;



	/*

	 * Only take down the adapter if the configuration change

	 * requires a reset.
@@ -359,14 +365,6 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) 
		}

	}



	ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,

				 adapter->ring_feature[RING_F_DCB].indices);

	if (ret) {

		if (adapter->dcb_set_bitmap & BIT_RESETLINK)

			clear_bit(__IXGBE_RESETTING, &adapter->state);

		return DCB_NO_HW_CHG;

	}



	if (adapter->dcb_cfg.pfc_mode_enable) {

		if ((adapter->hw.mac.type != ixgbe_mac_82598EB) &&

			(adapter->hw.fc.current_mode != ixgbe_fc_pfc))