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

Commit 4c1d7b4b authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: remove redundant configuration of tx_sample_rate 



This change fixes a minor redundancy in that tx_sample_rate was set twice.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d7ccb8c2

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

+4 −9
Original line number Diff line number Diff line
@@ -3409,16 +3409,12 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter) 


static void ixgbe_configure(struct ixgbe_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	struct ixgbe_hw *hw = &adapter->hw;

	int i;



	ixgbe_configure_pb(adapter);

#ifdef CONFIG_IXGBE_DCB

	ixgbe_configure_dcb(adapter);

#endif



	ixgbe_set_rx_mode(netdev);

	ixgbe_set_rx_mode(adapter->netdev);

	ixgbe_restore_vlan(adapter);



#ifdef IXGBE_FCOE
@@ -3427,15 +3423,14 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter) 


#endif /* IXGBE_FCOE */

	if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {

		for (i = 0; i < adapter->num_tx_queues; i++)

			adapter->tx_ring[i]->atr_sample_rate =

						       adapter->atr_sample_rate;

		ixgbe_init_fdir_signature_82599(hw, adapter->fdir_pballoc);

		ixgbe_init_fdir_signature_82599(&adapter->hw,

						adapter->fdir_pballoc);

	} else if (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE) {

		ixgbe_init_fdir_perfect_82599(&adapter->hw,

					      adapter->fdir_pballoc);

		ixgbe_fdir_filter_restore(adapter);

	}



	ixgbe_configure_virtualization(adapter);



	ixgbe_configure_tx(adapter);