lkml.org 
[lkml]   [2019]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 09/96] team: set slave to promisc if team is already in promisc mode
    Date
    From: Hangbin Liu <liuhangbin@gmail.com>

    [ Upstream commit 43c2adb9df7ddd6560fd3546d925b42cef92daa0 ]

    After adding a team interface to bridge, the team interface will enter
    promisc mode. Then if we add a new slave to team0, the slave will keep
    promisc off. Fix it by setting slave to promisc on if team master is
    already in promisc mode, also do the same for allmulti.

    v2: add promisc and allmulti checking when delete ports

    Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device")
    Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/team/team.c | 26 ++++++++++++++++++++++++++
    1 file changed, 26 insertions(+)

    --- a/drivers/net/team/team.c
    +++ b/drivers/net/team/team.c
    @@ -1250,6 +1250,23 @@ static int team_port_add(struct team *te
    goto err_option_port_add;
    }

    + /* set promiscuity level to new slave */
    + if (dev->flags & IFF_PROMISC) {
    + err = dev_set_promiscuity(port_dev, 1);
    + if (err)
    + goto err_set_slave_promisc;
    + }
    +
    + /* set allmulti level to new slave */
    + if (dev->flags & IFF_ALLMULTI) {
    + err = dev_set_allmulti(port_dev, 1);
    + if (err) {
    + if (dev->flags & IFF_PROMISC)
    + dev_set_promiscuity(port_dev, -1);
    + goto err_set_slave_promisc;
    + }
    + }
    +
    netif_addr_lock_bh(dev);
    dev_uc_sync_multiple(port_dev, dev);
    dev_mc_sync_multiple(port_dev, dev);
    @@ -1266,6 +1283,9 @@ static int team_port_add(struct team *te

    return 0;

    +err_set_slave_promisc:
    + __team_option_inst_del_port(team, port);
    +
    err_option_port_add:
    team_upper_dev_unlink(team, port);

    @@ -1311,6 +1331,12 @@ static int team_port_del(struct team *te

    team_port_disable(team, port);
    list_del_rcu(&port->list);
    +
    + if (dev->flags & IFF_PROMISC)
    + dev_set_promiscuity(port_dev, -1);
    + if (dev->flags & IFF_ALLMULTI)
    + dev_set_allmulti(port_dev, -1);
    +
    team_upper_dev_unlink(team, port);
    netdev_rx_handler_unregister(port_dev);
    team_port_disable_netpoll(port);

    \
     
     \ /
      Last update: 2019-04-24 19:48    [W:4.237 / U:0.736 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site