Message ID | 20190404124702.17041-1-liuhangbin@gmail.com |
---|---|
State | Rejected |
Delegated to: | David Miller |
Headers | show |
Series | [net] team: set slave to promisc if team is already in promisc mode | expand |
On Thu, Apr 04, 2019 at 08:47:02PM +0800, Hangbin Liu wrote: > 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. > > Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device") > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > --- > drivers/net/team/team.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c > index 6ed96fdfd96d..bbaa198d0960 100644 > --- a/drivers/net/team/team.c > +++ b/drivers/net/team/team.c > @@ -1246,6 +1246,23 @@ static int team_port_add(struct team *team, struct net_device *port_dev, > goto err_option_port_add; > } > > + /* set promiscuity level to new slave */ > + if (team->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 (team->dev->flags & IFF_ALLMULTI) { > + err = dev_set_allmulti(port_dev, 1); > + if (err) { > + if (team->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); > @@ -1262,6 +1279,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev, > > return 0; > > +err_set_slave_promisc: > + __team_option_inst_del_port(team, port); > + > err_option_port_add: > team_upper_dev_unlink(team, port); > > -- > 2.19.2 >
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 6ed96fdfd96d..bbaa198d0960 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1246,6 +1246,23 @@ static int team_port_add(struct team *team, struct net_device *port_dev, goto err_option_port_add; } + /* set promiscuity level to new slave */ + if (team->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 (team->dev->flags & IFF_ALLMULTI) { + err = dev_set_allmulti(port_dev, 1); + if (err) { + if (team->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); @@ -1262,6 +1279,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev, return 0; +err_set_slave_promisc: + __team_option_inst_del_port(team, port); + err_option_port_add: team_upper_dev_unlink(team, port);
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. Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- drivers/net/team/team.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)