ixgbe: remove redundant configuration of tx_sample_rate

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

(cherry picked from commit 4c1d7b4b5dec6b8a97202d88538c06733173b1c5)
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index fa94abf1e40105dc79274599b9afa3875b008e68..b3292e0ca0ebe0c8f81bd8b4b8b6190619ddfaf3 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3408,16 +3408,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
@@ -3426,15 +3422,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);