[PATCH net] team: team_port_add should check link_up before enable port

Now when users add a nic to team dev, the option 'enable' of the port
is true by default, as team_port_enable enables it after dev_open in
team_port_add.

But even if the port_dev has no carrier, like it's cable was unpluged,
the port is still enabled. It leads to that team dev couldn't work well
if this port was chosen to connect, and has no chance to change to use
other ports if link_watch is ethtool.

This patch is to enable the port only when the port_dev has carrier in
team_port_add.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
 drivers/net/team/team.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index a380649..42004ac 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c

@@ -1140,6 +1140,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
 	struct net_device *dev = team->dev;
 	struct team_port *port;
 	char *portname = port_dev->name;
+	bool linkup;
 	int err;
 
 	if (port_dev->flags & IFF_LOOPBACK) {

@@ -1249,9 +1250,12 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
 
 	port->index = -1;
 	list_add_tail_rcu(&port->list, &team->port_list);
-	team_port_enable(team, port);
+	linkup = !!netif_carrier_ok(port_dev);
+	if (linkup)
+		team_port_enable(team, port);
+
 	__team_compute_features(team);
-	__team_port_change_port_added(port, !!netif_carrier_ok(port_dev));
+	__team_port_change_port_added(port, linkup);
 	__team_options_change_check(team);
 
 	netdev_info(dev, "Port device %s added\n", portname);

-- 
2.1.0

On Sat, Dec 03, 2016 at 09:42:11PM +0800, Xin Long wrote:

The !! here is not needed anymore, netif_carrier_ok already returns a
bool.
static inline bool netif_carrier_ok(const struct net_device *dev)

+	if (linkup)
+		team_port_enable(team, port);
+
 	__team_compute_features(team);
-	__team_port_change_port_added(port, !!netif_carrier_ok(port_dev));
+	__team_port_change_port_added(port, linkup);
 	__team_options_change_check(team);
 
 	netdev_info(dev, "Port device %s added\n", portname);
-- 
2.1.0

On Sat, Dec 3, 2016 at 10:57 PM, Marcelo Ricardo Leitner
[off-list ref] wrote:

On Sat, Dec 03, 2016 at 09:42:11PM +0800, Xin Long wrote:

quoted

Now when users add a nic to team dev, the option 'enable' of the port
is true by default, as team_port_enable enables it after dev_open in
team_port_add.

But even if the port_dev has no carrier, like it's cable was unpluged,
the port is still enabled. It leads to that team dev couldn't work well
if this port was chosen to connect, and has no chance to change to use
other ports if link_watch is ethtool.

This patch is to enable the port only when the port_dev has carrier in
team_port_add.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
 drivers/net/team/team.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index a380649..42004ac 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c

@@ -1140,6 +1140,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
      struct net_device *dev = team->dev;
      struct team_port *port;
      char *portname = port_dev->name;
+     bool linkup;
      int err;

      if (port_dev->flags & IFF_LOOPBACK) {

@@ -1249,9 +1250,12 @@ static int team_port_add(struct team *team, struct net_device *port_dev)

      port->index = -1;
      list_add_tail_rcu(&port->list, &team->port_list);
-     team_port_enable(team, port);
+     linkup = !!netif_carrier_ok(port_dev);

The !! here is not needed anymore, netif_carrier_ok already returns a
bool.
static inline bool netif_carrier_ok(const struct net_device *dev)

will repost, thanks.

quoted

+     if (linkup)
+             team_port_enable(team, port);
+
      __team_compute_features(team);
-     __team_port_change_port_added(port, !!netif_carrier_ok(port_dev));
+     __team_port_change_port_added(port, linkup);
      __team_options_change_check(team);

      netdev_info(dev, "Port device %s added\n", portname);
--
2.1.0