Commit edfea6e6 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller

e1000e: Call e1000e_config_collision_dist() after TCTL has been set

e1000e_config_collision_dist() sets tctl, but subsequently tctl is
overwritten.  It seems to me that as things stand the call to
e1000e_config_collision_dist() has no effect and should either be
removed or moved down a little bit.  This kernel patch takes the latter
option.
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23a2d1b2
...@@ -2256,8 +2256,6 @@ static void e1000_configure_tx(struct e1000_adapter *adapter) ...@@ -2256,8 +2256,6 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
ew32(TARC(1), tarc); ew32(TARC(1), tarc);
} }
e1000e_config_collision_dist(hw);
/* Setup Transmit Descriptor Settings for eop descriptor */ /* Setup Transmit Descriptor Settings for eop descriptor */
adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS; adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS;
...@@ -2270,6 +2268,8 @@ static void e1000_configure_tx(struct e1000_adapter *adapter) ...@@ -2270,6 +2268,8 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
ew32(TCTL, tctl); ew32(TCTL, tctl);
e1000e_config_collision_dist(hw);
adapter->tx_queue_len = adapter->netdev->tx_queue_len; adapter->tx_queue_len = adapter->netdev->tx_queue_len;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment