From f1607d428edfdf72a40981615b7c97c3ed767d12 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Tue, 10 Apr 2012 05:15:46 +0000 Subject: [PATCH] --- yaml --- r: 300594 b: refs/heads/master c: cade455596504fae8e134a27189713ddf7c6d04d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/team/team.c | 2 +- trunk/drivers/net/team/team_mode_activebackup.c | 4 ++-- trunk/drivers/net/team/team_mode_loadbalance.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ace84ab83da5..5d3315dff1eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 679b16073008cc536e85e2773e67234b596fb62e +refs/heads/master: cade455596504fae8e134a27189713ddf7c6d04d diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c index e639abecd14f..153a62d03c9f 100644 --- a/trunk/drivers/net/team/team.c +++ b/trunk/drivers/net/team/team.c @@ -65,7 +65,7 @@ static int __set_port_mac(struct net_device *port_dev, return dev_set_mac_address(port_dev, &addr); } -int team_port_set_orig_mac(struct team_port *port) +static int team_port_set_orig_mac(struct team_port *port) { return __set_port_mac(port->dev, port->orig.dev_addr); } diff --git a/trunk/drivers/net/team/team_mode_activebackup.c b/trunk/drivers/net/team/team_mode_activebackup.c index a715c40e08c9..fd6bd03aaa89 100644 --- a/trunk/drivers/net/team/team_mode_activebackup.c +++ b/trunk/drivers/net/team/team_mode_activebackup.c @@ -90,12 +90,12 @@ static const struct team_option ab_options[] = { }, }; -int ab_init(struct team *team) +static int ab_init(struct team *team) { return team_options_register(team, ab_options, ARRAY_SIZE(ab_options)); } -void ab_exit(struct team *team) +static void ab_exit(struct team *team) { team_options_unregister(team, ab_options, ARRAY_SIZE(ab_options)); } diff --git a/trunk/drivers/net/team/team_mode_loadbalance.c b/trunk/drivers/net/team/team_mode_loadbalance.c index 167cdb4fe76e..2b506b29a874 100644 --- a/trunk/drivers/net/team/team_mode_loadbalance.c +++ b/trunk/drivers/net/team/team_mode_loadbalance.c @@ -130,13 +130,13 @@ static const struct team_option lb_options[] = { }, }; -int lb_init(struct team *team) +static int lb_init(struct team *team) { return team_options_register(team, lb_options, ARRAY_SIZE(lb_options)); } -void lb_exit(struct team *team) +static void lb_exit(struct team *team) { team_options_unregister(team, lb_options, ARRAY_SIZE(lb_options));