From patchwork Wed Dec 23 23:21:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 41705 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 68735B7BF5 for ; Thu, 24 Dec 2009 10:21:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755651AbZLWXVs (ORCPT ); Wed, 23 Dec 2009 18:21:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755640AbZLWXVs (ORCPT ); Wed, 23 Dec 2009 18:21:48 -0500 Received: from qmta03.westchester.pa.mail.comcast.net ([76.96.62.32]:37889 "EHLO QMTA03.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755394AbZLWXVp (ORCPT ); Wed, 23 Dec 2009 18:21:45 -0500 Received: from OMTA20.westchester.pa.mail.comcast.net ([76.96.62.71]) by QMTA03.westchester.pa.mail.comcast.net with comcast id Lcjg1d0021YDfWL53nMliQ; Wed, 23 Dec 2009 23:21:45 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA20.westchester.pa.mail.comcast.net with comcast id LnNG1d00134bfcX3gnNJcy; Wed, 23 Dec 2009 23:22:31 +0000 From: Jeff Kirsher Subject: [net-2.6 PATCH 3/4] igb: correctly offset 82575 flow control watermarks by 16 bytes To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Alexander Duyck , Jeff Kirsher Date: Wed, 23 Dec 2009 15:21:27 -0800 Message-ID: <20091223232126.16146.13862.stgit@localhost.localdomain> In-Reply-To: <20091223232047.16146.35264.stgit@localhost.localdomain> References: <20091223232047.16146.35264.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexander Duyck The watermark values for the 82575 were not being set correctly. As a result the high and low watermark values were set to the same value which can lead to excess xon/xoff packets being generated. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher --- drivers/net/igb/igb_main.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) -- 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/igb/igb_main.c b/drivers/net/igb/igb_main.c index 78963a0..933c64f 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1306,13 +1306,8 @@ void igb_reset(struct igb_adapter *adapter) hwm = min(((pba << 10) * 9 / 10), ((pba << 10) - 2 * adapter->max_frame_size)); - if (mac->type < e1000_82576) { - fc->high_water = hwm & 0xFFF8; /* 8-byte granularity */ - fc->low_water = fc->high_water - 8; - } else { - fc->high_water = hwm & 0xFFF0; /* 16-byte granularity */ - fc->low_water = fc->high_water - 16; - } + fc->high_water = hwm & 0xFFF0; /* 16-byte granularity */ + fc->low_water = fc->high_water - 16; fc->pause_time = 0xFFFF; fc->send_xon = 1; fc->current_mode = fc->requested_mode;