From 908652146a6079e29c254600f04f8c44c7b6135d Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 11 Jul 2012 05:34:04 +0000
Subject: [PATCH] --- yaml --- r: 315161 b: refs/heads/master c:
 68c450426ae665653b06f62539e48727b696496f h: refs/heads/master i:   315159:
 833d4c962ef9d64e762da4dc0a1fc6cf5f488a20 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/net/team/team.c | 12 ------------
 trunk/include/linux/if_team.h | 11 +++++++++--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index dea01fe05f02..8f69e1edbfaf 100644
--- 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
index bc7afa51d052..3620c63f9345 100644
--- 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
index dca426cb1e12..dfa0c8e0ab84 100644
--- 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);