From 833d4c962ef9d64e762da4dc0a1fc6cf5f488a20 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 11 Jul 2012 05:34:02 +0000
Subject: [PATCH] --- yaml --- r: 315159 b: refs/heads/master c:
 6e88e1357c788d40cd64a8c9080e81ca6c9eee0f h: refs/heads/master i:   315157:
 2ac3ad20d4ac09780120fd9e367668edd5369b7d   315155:
 e82301217d738313e3532861a162170fe5bc87fe   315151:
 7fa98569a497b72ad23a43adb2bfdff14b1855ec v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/team/team.c                 | 6 ++++++
 trunk/drivers/net/team/team_mode_roundrobin.c | 6 +++---
 trunk/include/linux/if_team.h                 | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 90c5f15f263f..806e15a2fc72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0a70e902f483295a8b6d74ef4393bc577b703d7
+refs/heads/master: 6e88e1357c788d40cd64a8c9080e81ca6c9eee0f
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
index 9b94f53a9d4b..bc7afa51d052 100644
--- a/trunk/drivers/net/team/team.c
+++ b/trunk/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/trunk/drivers/net/team/team_mode_roundrobin.c b/trunk/drivers/net/team/team_mode_roundrobin.c
index 52dd0ec9cd1f..0cf38e9b9d26 100644
--- a/trunk/drivers/net/team/team_mode_roundrobin.c
+++ b/trunk/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/trunk/include/linux/if_team.h b/trunk/include/linux/if_team.h
index 99efd60fa8c9..dca426cb1e12 100644
--- a/trunk/include/linux/if_team.h
+++ b/trunk/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);