aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2009-06-08 10:28:36 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-09 08:25:36 -0400
commitedfea6e641edee07bc69c70dd978088fc1cecd74 (patch)
treeac9780ee47595605a8828f4a0d1a54867a08fe9b /drivers/net/e1000e
parent23a2d1b233f535fc74f8dca66e488980b4db041b (diff)
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>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r--drivers/net/e1000e/netdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 9043f1b845fe..677f60490f67 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)
2256 ew32(TARC(1), tarc); 2256 ew32(TARC(1), tarc);
2257 } 2257 }
2258 2258
2259 e1000e_config_collision_dist(hw);
2260
2261 /* Setup Transmit Descriptor Settings for eop descriptor */ 2259 /* Setup Transmit Descriptor Settings for eop descriptor */
2262 adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS; 2260 adapter->txd_cmd = E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS;
2263 2261
@@ -2270,6 +2268,8 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
2270 2268
2271 ew32(TCTL, tctl); 2269 ew32(TCTL, tctl);
2272 2270
2271 e1000e_config_collision_dist(hw);
2272
2273 adapter->tx_queue_len = adapter->netdev->tx_queue_len; 2273 adapter->tx_queue_len = adapter->netdev->tx_queue_len;
2274} 2274}
2275 2275