From: Simon Horman Date: Mon, 8 Jun 2009 14:28:36 +0000 (+0000) Subject: e1000e: Call e1000e_config_collision_dist() after TCTL has been set X-Git-Tag: v2.6.31-rc1~14^2~161 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=edfea6e641edee07bc69c70dd978088fc1cecd74;hp=23a2d1b233f535fc74f8dca66e488980b4db041b;p=safe%2Fjmp%2Flinux-2.6 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 Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller --- diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 9043f1b..677f604 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -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; }