| Message ID | 20190329133707.67218-1-jwi@linux.ibm.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] team: use netif_is_team_port() | expand |
Fri, Mar 29, 2019 at 02:37:07PM CET, jwi@linux.ibm.com wrote: >Replace the team_port_exists() macro with its twin from netdevice.h > >CC: Jiri Pirko <jiri@resnulli.us> >Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Acked-by: Jiri Pirko <jiri@mellanox.com>
From: Julian Wiedmann <jwi@linux.ibm.com> Date: Fri, 29 Mar 2019 14:37:07 +0100 > Replace the team_port_exists() macro with its twin from netdevice.h > > CC: Jiri Pirko <jiri@resnulli.us> > Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> Applied.
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 6ad74f898832..a622ec33453a 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -38,13 +38,11 @@ * Helpers **********/ -#define team_port_exists(dev) (dev->priv_flags & IFF_TEAM_PORT) - static struct team_port *team_port_get_rtnl(const struct net_device *dev) { struct team_port *port = rtnl_dereference(dev->rx_handler_data); - return team_port_exists(dev) ? port : NULL; + return netif_is_team_port(dev) ? port : NULL; } /* @@ -1143,7 +1141,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev, return -EINVAL; } - if (team_port_exists(port_dev)) { + if (netif_is_team_port(port_dev)) { NL_SET_ERR_MSG(extack, "Device is already a port of a team device"); netdev_err(dev, "Device %s is already a port " "of a team device\n", portname);
Replace the team_port_exists() macro with its twin from netdevice.h CC: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> --- drivers/net/team/team.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)