Re: [PATCH net v2 0/2] bridge: mrp: Update MRP_PORT_ROLE

2020-06-24 Thread Vladimir Oltean
Hi Horatiu,

On Wed, 24 Jun 2020 at 14:34, Horatiu Vultur
 wrote:
>
> The 06/23/2020 14:38, David Miller wrote:
> > EXTERNAL EMAIL: Do not click links or open attachments unless you know the 
> > content is safe
> >
> > From: Horatiu Vultur 
> > Date: Tue, 23 Jun 2020 11:05:39 +0200
> >
> > > This patch series does the following:
> > > - fixes the enum br_mrp_port_role_type. It removes the port role none(0x2)
> > >   because this is in conflict with the standard. The standard defines the
> > >   interconnect port role as value 0x2.
> > > - adds checks regarding current defined port roles: primary(0x0) and
> > >   secondary(0x1).
> > >
> > > v2:
> > >  - add the validation code when setting the port role.
> >
> > Series applied, thank you.
>
> Thanks. Will these patches be applied also on net-next?
> Because if I start now to add support for the interconnect port, these
> patches are needed on net-next. Or do I need to add these patches to the
> patch series for the interconnect port?
> What is the correct way of doing this?
>
> --
> /Horatiu

The "net" tree is merged weekly (or so) by David into "net-next". So,
your patches should be available at the beginning of the next week.

Cheers,
-Vladimir


Re: [PATCH net v2 0/2] bridge: mrp: Update MRP_PORT_ROLE

2020-06-24 Thread Horatiu Vultur
The 06/23/2020 14:38, David Miller wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the 
> content is safe
> 
> From: Horatiu Vultur 
> Date: Tue, 23 Jun 2020 11:05:39 +0200
> 
> > This patch series does the following:
> > - fixes the enum br_mrp_port_role_type. It removes the port role none(0x2)
> >   because this is in conflict with the standard. The standard defines the
> >   interconnect port role as value 0x2.
> > - adds checks regarding current defined port roles: primary(0x0) and
> >   secondary(0x1).
> >
> > v2:
> >  - add the validation code when setting the port role.
> 
> Series applied, thank you.

Thanks. Will these patches be applied also on net-next?
Because if I start now to add support for the interconnect port, these
patches are needed on net-next. Or do I need to add these patches to the
patch series for the interconnect port?
What is the correct way of doing this?

-- 
/Horatiu


Re: [PATCH net v2 0/2] bridge: mrp: Update MRP_PORT_ROLE

2020-06-23 Thread David Miller
From: Horatiu Vultur 
Date: Tue, 23 Jun 2020 11:05:39 +0200

> This patch series does the following:
> - fixes the enum br_mrp_port_role_type. It removes the port role none(0x2)
>   because this is in conflict with the standard. The standard defines the
>   interconnect port role as value 0x2.
> - adds checks regarding current defined port roles: primary(0x0) and
>   secondary(0x1).
> 
> v2:
>  - add the validation code when setting the port role.

Series applied, thank you.


[PATCH net v2 0/2] bridge: mrp: Update MRP_PORT_ROLE

2020-06-23 Thread Horatiu Vultur
This patch series does the following:
- fixes the enum br_mrp_port_role_type. It removes the port role none(0x2)
  because this is in conflict with the standard. The standard defines the
  interconnect port role as value 0x2.
- adds checks regarding current defined port roles: primary(0x0) and
  secondary(0x1).

v2:
 - add the validation code when setting the port role.

Horatiu Vultur (2):
  bridge: uapi: mrp: Fix MRP_PORT_ROLE
  bridge: mrp: Validate when setting the port role

 include/uapi/linux/mrp_bridge.h |  1 -
 net/bridge/br_mrp.c | 10 --
 2 files changed, 8 insertions(+), 3 deletions(-)

-- 
2.26.2