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

Commit 67ebd791 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ixgbe: move setting of GSO size for 82598 into ixgbe_configure_dcb 



We are unnecessarily modifying the GSO size for all HW when we don't need
to.  The code can be simplified by moving the check for DCB and the
adjustment of the GSO size for 82598 into ixgbe_configure_dcb.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d716a7d8

drivers/net/ixgbe/ixgbe_main.c

+10 −11
Original line number Diff line number Diff line
@@ -3157,6 +3157,15 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter) 
	u32 txdctl;

	int i, j;



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

		if (hw->mac.type == ixgbe_mac_82598EB)

			netif_set_gso_max_size(adapter->netdev, 65536);

		return;

	}



	if (hw->mac.type == ixgbe_mac_82598EB)

		netif_set_gso_max_size(adapter->netdev, 32768);



	ixgbe_dcb_check_config(&adapter->dcb_cfg);

	ixgbe_dcb_calculate_tc_credits(&adapter->dcb_cfg, DCB_TX_CONFIG);

	ixgbe_dcb_calculate_tc_credits(&adapter->dcb_cfg, DCB_RX_CONFIG);
@@ -3188,17 +3197,7 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter) 


	ixgbe_restore_vlan(adapter);

#ifdef CONFIG_IXGBE_DCB

	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {

		if (hw->mac.type == ixgbe_mac_82598EB)

			netif_set_gso_max_size(netdev, 32768);

		else

			netif_set_gso_max_size(netdev, 65536);

	ixgbe_configure_dcb(adapter);

	} else {

		netif_set_gso_max_size(netdev, 65536);

	}

#else

	netif_set_gso_max_size(netdev, 65536);

#endif



#ifdef IXGBE_FCOE