]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
team: use netif_is_team_port()
authorJulian Wiedmann <jwi@linux.ibm.com>
Fri, 29 Mar 2019 13:37:07 +0000 (14:37 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Mar 2019 20:48:11 +0000 (13:48 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/team/team.c

index 6ad74f8988322dda1f3ad5282e8437d9cc785f61..a622ec33453a5313050378ff75a0dafa53054e9b 100644 (file)
  * 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);