From patchwork Sun May 17 22:35:36 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: 27328 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 6043EB7067 for ; Mon, 18 May 2009 08:36:04 +1000 (EST) Received: by ozlabs.org (Postfix) id 54C14DE0A0; Mon, 18 May 2009 08:36:04 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id EEED4DE09E for ; Mon, 18 May 2009 08:36:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755397AbZEQWf5 (ORCPT ); Sun, 17 May 2009 18:35:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755398AbZEQWfz (ORCPT ); Sun, 17 May 2009 18:35:55 -0400 Received: from qmta04.westchester.pa.mail.comcast.net ([76.96.62.40]:55674 "EHLO QMTA04.westchester.pa.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755386AbZEQWfz (ORCPT ); Sun, 17 May 2009 18:35:55 -0400 Received: from OMTA09.westchester.pa.mail.comcast.net ([76.96.62.20]) by QMTA04.westchester.pa.mail.comcast.net with comcast id seos1b0030SCNGk54mbxQd; Sun, 17 May 2009 22:35:57 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA09.westchester.pa.mail.comcast.net with comcast id smbd1b00634bfcX3Vmbf0z; Sun, 17 May 2009 22:35:54 +0000 From: Jeff Kirsher Subject: [net-next-2.6 PATCH 10/11] ixgbe: When in DCB mode with PFC enabled, show LFC is disabled To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-scsi@vger.kernel.org, Peter P Waskiewicz Jr , Jeff Kirsher Date: Sun, 17 May 2009 15:35:36 -0700 Message-ID: <20090517223535.14124.44645.stgit@localhost.localdomain> In-Reply-To: <20090517223213.14124.61405.stgit@localhost.localdomain> References: <20090517223213.14124.61405.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: Peter P Waskiewicz Jr Ethtool should report that link flow control is disabled when in priority flow control mode. Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher --- drivers/net/ixgbe/ixgbe_ethtool.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 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/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index 6c73243..35255b8 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c @@ -254,6 +254,13 @@ static void ixgbe_get_pauseparam(struct net_device *netdev, else pause->autoneg = 1; +#ifdef CONFIG_DCB + if (hw->fc.current_mode == ixgbe_fc_pfc) { + pause->rx_pause = 0; + pause->tx_pause = 0; + } + +#endif if (hw->fc.current_mode == ixgbe_fc_rx_pause) { pause->rx_pause = 1; } else if (hw->fc.current_mode == ixgbe_fc_tx_pause) {