team: use function team_port_txable() for determing enabled and up port

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 9b94f53a9d4bc313dc63d0690a02c457e4199c70..bc7afa51d05234c555dae350d23b83a1ba72d3ec 100644 (file)
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -677,6 +677,12 @@ bool team_port_enabled(struct team_port *port)
 }
 EXPORT_SYMBOL(team_port_enabled);
 
+bool team_port_txable(struct team_port *port)
+{
+       return port->linkup && team_port_enabled(port);
+}
+EXPORT_SYMBOL(team_port_txable);
+
 /*
  * Enable/disable port by adding to enabled port hashlist and setting
  * port->index (Might be racy so reader could see incorrect ifindex when

diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c
index 52dd0ec9cd1fb4c0f17098701652e19c62c233be..0cf38e9b9d2683887582216144919c94ffcc8b32 100644 (file)
--- a/drivers/net/team/team_mode_roundrobin.c
+++ b/drivers/net/team/team_mode_roundrobin.c
@@ -30,16 +30,16 @@ static struct team_port *__get_first_port_up(struct team *team,
 {
        struct team_port *cur;
 
-       if (port->linkup)
+       if (team_port_txable(port))
                return port;
        cur = port;
        list_for_each_entry_continue_rcu(cur, &team->port_list, list)
-               if (cur->linkup)
+               if (team_port_txable(port))
                        return cur;
        list_for_each_entry_rcu(cur, &team->port_list, list) {
                if (cur == port)
                        break;
-               if (cur->linkup)
+               if (team_port_txable(port))
                        return cur;
        }
        return NULL;

diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 99efd60fa8c9f9b92e7776af07ac368a7e8ec56d..dca426cb1e1228c5dfefd25b9bb6a0d485c57f79 100644 (file)
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -64,6 +64,7 @@ struct team_port {
 };
 
 extern bool team_port_enabled(struct team_port *port);
+extern bool team_port_txable(struct team_port *port);
 
 struct team_mode_ops {
        int (*init)(struct team *team);