From 2c2946b4761f3976dc465f21feee8aa443111749 Mon Sep 17 00:00:00 2001
From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Date: Sun, 17 May 2009 12:35:36 +0000
Subject: [PATCH] --- yaml --- r: 150253 b: refs/heads/master c:
 8756924c1ecc832c1a5603d10f5cd201e299b312 h: refs/heads/master i:   150251:
 7b3e848b7648dc4021d9d35d156ddde803628220 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 66341bd23ff5..15a6e94819cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 264857b8fe8a16fc95f12e898951fc6bd4bdaa7a
+refs/heads/master: 8756924c1ecc832c1a5603d10f5cd201e299b312
diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
index 6c7324339ec8..35255b8e90b7 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/trunk/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) {