From patchwork Wed Mar 3 14:31:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franco Fichtner X-Patchwork-Id: 46807 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D3265B7CEC for ; Thu, 4 Mar 2010 01:31:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754492Ab0CCObj (ORCPT ); Wed, 3 Mar 2010 09:31:39 -0500 Received: from host64.kissl.de ([213.239.241.64]:39246 "EHLO host64.kissl.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754449Ab0CCObi (ORCPT ); Wed, 3 Mar 2010 09:31:38 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by host64.kissl.de (Postfix) with ESMTP id 226651220126; Wed, 3 Mar 2010 15:31:37 +0100 (CET) Received: from host64.kissl.de ([127.0.0.1]) by localhost (host64.kissl.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z8s0GxWuQUGn; Wed, 3 Mar 2010 15:31:37 +0100 (CET) Received: by host64.kissl.de (Postfix, from userid 1000) id 0BCA01220127; Wed, 3 Mar 2010 15:31:37 +0100 (CET) To: Brandeburg@host64.kissl.de, Jesse Subject: =?ISO-8859-1?Q?[net-next-2.6 PATCH] ?= =?ISO-8859-1?Q?e1000e: do not modify?= =?ISO-8859-1?Q? tx_queue_len on link?= =?ISO-8859-1?Q? speed change?= X-PHP-Script: host64.kissl.de/poplogin/email_neu.php for 79.222.113.59 From: franco@lastsummer.de X-Priority: 3 Importance: Normal X-MSMail-Priority: Normal X-MimeOLE: Produced by Parallels Confixx WebMail X-Mailer: Parallels Confixx WebMail (like SquirrelMail) Cc: Netdev , Allan@host64.kissl.de, Bruce W MIME-Version: 1.0 Message-Id: <20100303143137.0BCA01220127@host64.kissl.de> Date: Wed, 3 Mar 2010 15:31:37 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org e1000e would try to set appropriate values of tx_queue_len for negotiated link speeds overwriting the already set configuration of tx_queue_len in the process. This removes all lines touching tx_queue_len from the driver. Signed-off-by: Franco Fichtner --- drivers/net/e1000e/netdev.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) /** @@ -2877,7 +2875,6 @@ void e1000e_down(struct e1000_adapter *adapter) del_timer_sync(&adapter->watchdog_timer); del_timer_sync(&adapter->phy_info_timer); - netdev->tx_queue_len = adapter->tx_queue_len; netif_carrier_off(netdev); adapter->link_speed = 0; adapter->link_duplex = 0; @@ -3588,21 +3585,15 @@ static void e1000_watchdog_task(struct work_struct *work) "link gets many collisions.\n"); } - /* - * tweak tx_queue_len according to speed/duplex - * and adjust the timeout factor - */ - netdev->tx_queue_len = adapter->tx_queue_len; + /* adjust timeout factor according to speed/duplex */ adapter->tx_timeout_factor = 1; switch (adapter->link_speed) { case SPEED_10: txb2b = 0; - netdev->tx_queue_len = 10; adapter->tx_timeout_factor = 16; break; case SPEED_100: txb2b = 0; - netdev->tx_queue_len = 100; adapter->tx_timeout_factor = 10; break; } -- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 88d54d3..e1cceb6 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -2289,8 +2289,6 @@ 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; }