[PATCH net-next] bonding: fix bond_option_mode_set warning

[PATCH net-next] bonding: fix bond_option_mode_set warning

[Nikolay Aleksandrov]

During the conversion to "static" functions this one got left out, only its
prototype was converted, thus resulting in:
drivers/net/bonding//bond_options.c:674:5: warning: symbol
'bond_option_mode_set' was not declared. Should it be static?

Fix it by making it static and also break the line in two as it was too
long.

CC: Stephen Hemminger <stephen@networkplumber.org>
CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Veaceslav Falico <vfalico@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: David S. Miller <davem@davemloft.net>

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
---
 drivers/net/bonding/bond_options.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 540e0167bf24..124a8135e139 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -671,7 +671,8 @@ const struct bond_option *bond_opt_get(unsigned int option)
 	return &bond_opts[option];
 }
 
-int bond_option_mode_set(struct bonding *bond, const struct bond_opt_value *newval)
+static int bond_option_mode_set(struct bonding *bond,
+				const struct bond_opt_value *newval)
 {
 	if (!bond_mode_uses_arp(newval->value) && bond->params.arp_interval) {
 		pr_info("%s: %s mode is incompatible with arp monitoring, start mii monitoring\n",
-- 
1.9.3

Re: [PATCH net-next] bonding: fix bond_option_mode_set warning

[Nikolay Aleksandrov]

On 07/15/2014 04:08 PM, Nikolay Aleksandrov wrote:
> During the conversion to "static" functions this one got left out, only its
> prototype was converted, thus resulting in:
> drivers/net/bonding//bond_options.c:674:5: warning: symbol
> 'bond_option_mode_set' was not declared. Should it be static?
> 
> Fix it by making it static and also break the line in two as it was too
> long.
> 
> CC: Stephen Hemminger <stephen@networkplumber.org>
> CC: Jay Vosburgh <j.vosburgh@gmail.com>
> CC: Veaceslav Falico <vfalico@gmail.com>
> CC: Andy Gospodarek <andy@greyhouse.net>
> CC: David S. Miller <davem@davemloft.net>
> 
> Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
> ---

Just FYI, I targeted this at net-next as it's more cosmetic and there aren't any
real side-effects because of it. In case you decide it's more appropriate for
-net, the commit that did this was:
f3253339a47f ("bonding: options handling cleanup")

and I tested that this patch applies cleanly to -net, so it's fit for there too.

Cheers,
 Nik

Re: [PATCH net-next] bonding: fix bond_option_mode_set warning

[David Miller]

From: Nikolay Aleksandrov <nikolay@redhat.com>
Date: Tue, 15 Jul 2014 16:08:57 +0200

> During the conversion to "static" functions this one got left out, only its
> prototype was converted, thus resulting in:
> drivers/net/bonding//bond_options.c:674:5: warning: symbol
> 'bond_option_mode_set' was not declared. Should it be static?
> 
> Fix it by making it static and also break the line in two as it was too
> long.
> 
> CC: Stephen Hemminger <stephen@networkplumber.org>
> CC: Jay Vosburgh <j.vosburgh@gmail.com>
> CC: Veaceslav Falico <vfalico@gmail.com>
> CC: Andy Gospodarek <andy@greyhouse.net>
> CC: David S. Miller <davem@davemloft.net>
> 
> Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>

Applied, thanks Nikolay.