forked from luck/tmp_suning_uos_patched
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: Simon Horman <horms@verge.net.au> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
23a2d1b233
commit
edfea6e641
|
@ -2256,8 +2256,6 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
|
|||
ew32(TARC(1), tarc);
|
||||
}
|
||||
|
||||
e1000e_config_collision_dist(hw);
|
||||
|
||||
/* Setup Transmit Descriptor Settings for eop descriptor */
|
||||
adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS;
|
||||
|
||||
|
@ -2270,6 +2268,8 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
|
|||
|
||||
ew32(TCTL, tctl);
|
||||
|
||||
e1000e_config_collision_dist(hw);
|
||||
|
||||
adapter->tx_queue_len = adapter->netdev->tx_queue_len;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user