---

yaml --- r: 315161 b: refs/heads/master c: 68c4504 h: refs/heads/master i: 315159: 833d4c9 v: v3
git-mirror · Jul 12, 2012 · 9086521 · 9086521
1 parent db266b4
commit 9086521
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fc889911a99043a97da1daa0d010ad72cbc3042
+refs/heads/master: 68c450426ae665653b06f62539e48727b696496f
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
@@ -671,18 +671,6 @@ static bool team_port_find(const struct team *team,
 	return false;
 }
 
-bool team_port_enabled(struct team_port *port)
-{
-	return port->index != -1;
-}
-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/include/linux/if_team.h b/trunk/include/linux/if_team.h
@@ -63,8 +63,15 @@ struct team_port {
 	long mode_priv[0];
 };
 
-extern bool team_port_enabled(struct team_port *port);
-extern bool team_port_txable(struct team_port *port);
+static inline bool team_port_enabled(struct team_port *port)
+{
+	return port->index != -1;
+}
+
+static inline bool team_port_txable(struct team_port *port)
+{
+	return port->linkup && team_port_enabled(port);
+}
 
 struct team_mode_ops {
 	int (*init)(struct team *team);