| Message ID | 1437646465-6462-1-git-send-email-harinik@xilinx.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Le 23/07/2015 12:14, Harini Katakam a écrit : > JUMBO and NO_GIGABIT_HALF have the same capability masks. > Change one of them. > > Signed-off-by: Harini Katakam <harinik@xilinx.com> Yes, indeed: 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 d746559..8fb80b2 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -399,7 +399,7 @@ > #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 > #define MACB_CAPS_SG_DISABLED 0x40000000 > #define MACB_CAPS_MACB_IS_GEM 0x80000000 > -#define MACB_CAPS_JUMBO 0x00000008 > +#define MACB_CAPS_JUMBO 0x00000010 > > /* Bit manipulation macros */ > #define MACB_BIT(name) \ >
On 23/07/2015 at 15:44:25 +0530, Harini Katakam wrote : > JUMBO and NO_GIGABIT_HALF have the same capability masks. > Change one of them. > > Signed-off-by: Harini Katakam <harinik@xilinx.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index d746559..8fb80b2 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -399,7 +399,7 @@ #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 #define MACB_CAPS_SG_DISABLED 0x40000000 #define MACB_CAPS_MACB_IS_GEM 0x80000000 -#define MACB_CAPS_JUMBO 0x00000008 +#define MACB_CAPS_JUMBO 0x00000010 /* Bit manipulation macros */ #define MACB_BIT(name) \
JUMBO and NO_GIGABIT_HALF have the same capability masks. Change one of them. Signed-off-by: Harini Katakam <harinik@xilinx.com> --- drivers/net/ethernet/cadence/macb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)