lkml.org 
[lkml]   [2017]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.13 034/160] net: dsa: mv88e6xxx: Allow dsa and cpu ports in multiple vlans
    Date
    4.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Andrew Lunn <andrew@lunn.ch>


    [ Upstream commit db06ae41945b14feb7f696dcafe8048cc37e8a20 ]

    Ports with the same VLAN must all be in the same bridge. However the
    CPU and DSA ports need to be in multiple VLANs spread over multiple
    bridges. So exclude them when performing this test.

    Fixes: b2f81d304cee ("net: dsa: add CPU and DSA ports as VLAN members")
    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/dsa/mv88e6xxx/chip.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/drivers/net/dsa/mv88e6xxx/chip.c
    +++ b/drivers/net/dsa/mv88e6xxx/chip.c
    @@ -1184,6 +1184,10 @@ static int mv88e6xxx_port_check_hw_vlan(
    };
    int i, err;

    + /* DSA and CPU ports have to be members of multiple vlans */
    + if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))
    + return 0;
    +
    if (!vid_begin)
    return -EOPNOTSUPP;


    \
     
     \ /
      Last update: 2017-10-10 22:37    [W:4.117 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site