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

Commit 5facb8e0 authored by John Fastabend's avatar John Fastabend Committed by Jeff Kirsher
Browse files

ixgbe: dcb: up2tc mapping lost on disable/enable CEE DCB state 



Users expect the up2tc mapping to be maintained across a DCB
enable/disable/enable transition. And since we maintain all
the other DCB attributes we should do this for up2tc mappings
as well just to be consistent. Also without this we break
user space applications that expect this to occur that
previously worked.

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9d837ea2

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c

+9 −2
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ static u8 ixgbe_dcbnl_get_state(struct net_device *netdev) 
static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)

{

	u8 err = 0;

	u8 prio_tc[MAX_USER_PRIORITY] = {0};

	int i;

	struct ixgbe_adapter *adapter = netdev_priv(netdev);



	/* Fail command if not in CEE mode */
@@ -122,10 +124,15 @@ 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)

	if (state > 0) {

		err = ixgbe_setup_tc(netdev, adapter->dcb_cfg.num_tcs.pg_tcs);

	else

		ixgbe_dcb_unpack_map(&adapter->dcb_cfg, DCB_TX_CONFIG, prio_tc);

	} else {

		err = ixgbe_setup_tc(netdev, 0);

	}



	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)

		netdev_set_prio_tc_map(netdev, i, prio_tc[i]);



	return err;

}