| Message ID | 1470036023-22368-1-git-send-email-harinik@xilinx.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
Le 01/08/2016 à 09:20, Harini Katakam a écrit : > USRIO and JUMBO CAPS have the same mask. > Fix the same. > > Signed-off-by: Harini Katakam <harinik@xilinx.com> Hi, Indeed there's a bug... > --- > 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 Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Can you please send it independently without the RFC tag in the subject and with the following tags in the body as well: Fixes: ce721a702197 ("net: ethernet: cadence-macb: Add disabled usrio caps") Cc: stable@vger.kernel.org # v4.5+ > /* Bit manipulation macros */ > #define MACB_BIT(name) \ > Thanks, bye,
On Thu, Aug 4, 2016 at 7:37 PM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote: > Le 01/08/2016 à 09:20, Harini Katakam a écrit : >> USRIO and JUMBO CAPS have the same mask. >> Fix the same. >> >> Signed-off-by: Harini Katakam <harinik@xilinx.com> > > Hi, > Indeed there's a bug... > > >> --- >> 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 > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Can you please send it independently without the RFC tag in the subject > and with the following tags in the body as well: > > Fixes: ce721a702197 ("net: ethernet: cadence-macb: Add disabled usrio caps") > Cc: stable@vger.kernel.org # v4.5+ > Thanks Nicolas. I'll do that. Regards, Harini >> /* Bit manipulation macros */ >> #define MACB_BIT(name) \ >> > > Thanks, bye, > -- > Nicolas Ferre
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) \
USRIO and JUMBO CAPS have the same mask. Fix the same. Signed-off-by: Harini Katakam <harinik@xilinx.com> --- drivers/net/ethernet/cadence/macb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)