* [PATCH] net: macb: Correct CAPS mask
@ 2016-08-05 5:01 Harini Katakam
2016-08-07 7:25 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Harini Katakam @ 2016-08-05 5:01 UTC (permalink / raw)
To: nicolas.ferre, davem, harinikatakamlinux
Cc: netdev, linux-kernel, harinik, punnaia, michals, stable
USRIO and JUMBO CAPS have the same mask.
Fix the same.
Fixes: ce721a702197 ("net: ethernet: cadence-macb: Add disabled usrio caps")
Cc: stable@vger.kernel.org # v4.5+
Signed-off-by: Harini Katakam <harinik@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/net/ethernet/cadence/macb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 36893d8..b6fcf10 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -403,11 +403,11 @@
#define MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII 0x00000004
#define MACB_CAPS_NO_GIGABIT_HALF 0x00000008
#define MACB_CAPS_USRIO_DISABLED 0x00000010
+#define MACB_CAPS_JUMBO 0x00000020
#define MACB_CAPS_FIFO_MODE 0x10000000
#define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000
#define MACB_CAPS_SG_DISABLED 0x40000000
#define MACB_CAPS_MACB_IS_GEM 0x80000000
-#define MACB_CAPS_JUMBO 0x00000010
/* Bit manipulation macros */
#define MACB_BIT(name) \
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: macb: Correct CAPS mask
2016-08-05 5:01 [PATCH] net: macb: Correct CAPS mask Harini Katakam
@ 2016-08-07 7:25 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-08-07 7:25 UTC (permalink / raw)
To: harini.katakam
Cc: nicolas.ferre, harinikatakamlinux, netdev, linux-kernel, harinik,
punnaia, michals, stable
From: Harini Katakam <harini.katakam@xilinx.com>
Date: Fri, 5 Aug 2016 10:31:58 +0530
> USRIO and JUMBO CAPS have the same mask.
> Fix the same.
>
> Fixes: ce721a702197 ("net: ethernet: cadence-macb: Add disabled usrio caps")
> Cc: stable@vger.kernel.org # v4.5+
> Signed-off-by: Harini Katakam <harinik@xilinx.com>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-07 7:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-05 5:01 [PATCH] net: macb: Correct CAPS mask Harini Katakam
2016-08-07 7:25 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).