From 10abeb8238ee69ebf3a3e1c752a0d8fef0ffddff Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Thu, 7 May 2009 10:39:16 +0000
Subject: [PATCH] --- yaml --- r: 150119 b: refs/heads/master c:
 163de42e240623694562656542adedbca369beaf h: refs/heads/master i:   150117:
 eac8726e78a516b0adf3aa7983de38742298dbef   150115:
 a35c412e61ab1bb7e8380a1aa172b2b7c7d61f5f   150111:
 c20a9046009181b525a010ae1efcd1b9c8eb7cd7 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/ixgbe/ixgbe_main.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bb16f8caa2fa..cd54f8cce8ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afafd5b020a60b72d064e89244cb44a975eb2407
+refs/heads/master: 163de42e240623694562656542adedbca369beaf
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
index 4c38d51397ce..d64a2d7d5fa5 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_main.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -1740,7 +1740,18 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter, int index)
 	unsigned long mask;
 
 	if (adapter->hw.mac.type == ixgbe_mac_82599EB) {
-		queue0 = index;
+		if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
+			int dcb_i = adapter->ring_feature[RING_F_DCB].indices;
+			if (dcb_i == 8)
+				queue0 = index >> 4;
+			else if (dcb_i == 4)
+				queue0 = index >> 5;
+			else
+				dev_err(&adapter->pdev->dev, "Invalid DCB "
+				        "configuration\n");
+		} else {
+			queue0 = index;
+		}
 	} else {
 		mask = (unsigned long) adapter->ring_feature[RING_F_RSS].mask;
 		queue0 = index & mask;