diff mbox

[v2,1/2] net: macb: Include multi queue support for xilinx ZynqMP ethernet version

Message ID 299bfd8acf19df0b4407f98caf5130c1823cf8ad.1425662901.git.michal.simek@xilinx.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Michal Simek March 6, 2015, 5:29 p.m. UTC 
From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>

Include multi queue support for the ethernet IP version in xilinx ZynqMP
SoC.

Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---

Changes in v2:
- Rebase on net-next
- Add Nilocas ACK

 drivers/net/ethernet/cadence/macb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller March 6, 2015, 8:48 p.m. UTC | #1 
From: Michal Simek <michal.simek@xilinx.com>
Date: Fri,  6 Mar 2015 18:29:11 +0100

> From: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>
> 
> Include multi queue support for the ethernet IP version in xilinx ZynqMP
> SoC.
> 
> Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Applied.
--
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 mbox

Patch

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 1fe8b946243a..0436aefa49e4 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2211,7 +2211,7 @@  static void macb_probe_queues(void __iomem *mem,
 	/* is it macb or gem ? */
 	mid = readl_relaxed(mem + MACB_MID);
 
-	if (MACB_BFEXT(IDNUM, mid) != 0x2)
+	if (MACB_BFEXT(IDNUM, mid) < 0x2)
 		return;
 
 	/* bit 0 is never set but queue 0 always exists */