summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2012-07-11 05:34:04 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-12 08:08:20 -0700
commit68c450426ae665653b06f62539e48727b696496f (patch)
tree6e8d12827a773c3e93973c2e6529bdd608e38a6a
parent5fc889911a99043a97da1daa0d010ad72cbc3042 (diff)
team: make team_port_enabled() and team_port_txable() static inline
Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/team/team.c12
-rw-r--r--include/linux/if_team.h11
2 files changed, 9 insertions, 14 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index bc7afa51d052..3620c63f9345 100644
--- a/drivers/net/team/team.c
+++ b/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/include/linux/if_team.h b/include/linux/if_team.h
index dca426cb1e12..dfa0c8e0ab84 100644
--- a/include/linux/if_team.h
+++ b/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);