---

yaml
---
r: 150119
b: refs/heads/master
c: 163de42
h: refs/heads/master
i:
  150117: eac8726
  150115: a35c412
  150111: c20a904
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afafd5b020a60b72d064e89244cb44a975eb2407
+refs/heads/master: 163de42e240623694562656542adedbca369beaf

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;