From 8aba3034905c6950244e84d1d621be493277cef6 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Mon, 8 Jun 2009 14:28:36 +0000 Subject: [PATCH] --- yaml --- r: 150778 b: refs/heads/master c: edfea6e641edee07bc69c70dd978088fc1cecd74 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d35f83894c89..c44aae95c676 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23a2d1b233f535fc74f8dca66e488980b4db041b +refs/heads/master: edfea6e641edee07bc69c70dd978088fc1cecd74 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index 9043f1b845fe..677f60490f67 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/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; }