hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

team: use netif_is_team_port() 

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>
This commit is contained in:
Julian Wiedmann 2019-03-29 14:37:07 +01:00 committed by David S. Miller
parent 9f764898c7
commit acb10eac51
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/team/team.c
View File

@ -38,13 +38,11 @@
* Helpers * 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) static struct team_port *team_port_get_rtnl(const struct net_device *dev)
{ {
struct team_port *port = rtnl_dereference(dev->rx_handler_data); 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; 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"); NL_SET_ERR_MSG(extack, "Device is already a port of a team device");
netdev_err(dev, "Device %s is already a port " netdev_err(dev, "Device %s is already a port "
"of a team device\n", portname); "of a team device\n", portname);