aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_options.c
diff options
context:
space:
mode:
authorVeaceslav Falico <vfalico@gmail.com>2014-05-15 21:39:53 +0200
committerDavid S. Miller <davem@davemloft.net>2014-05-16 16:34:32 -0400
commit267bed777a5f8a8f5acd50a9134c7341fc46d822 (patch)
treed80c9e21d1a2b5a64717ec41f9a86244f86c038a /drivers/net/bonding/bond_options.c
parentbonding: make TX_QUEUE_OVERRIDE() macro an inline function (diff)
downloadlinux-dev-267bed777a5f8a8f5acd50a9134c7341fc46d822.tar.xz
linux-dev-267bed777a5f8a8f5acd50a9134c7341fc46d822.zip
bonding: make BOND_NO_USES_ARP an inline function
Also, change its name to better reflect its scope, and skip the "no" part. CC: Jay Vosburgh <j.vosburgh@gmail.com> CC: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Veaceslav Falico <vfalico@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_options.c')
-rw-r--r--drivers/net/bonding/bond_options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 6dc49da106d6..98c8801ddb67 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -672,7 +672,7 @@ const struct bond_option *bond_opt_get(unsigned int option)
int bond_option_mode_set(struct bonding *bond, const struct bond_opt_value *newval)
{
- if (BOND_NO_USES_ARP(newval->value) && bond->params.arp_interval) {
+ 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",
bond->dev->name, newval->string);
/* disable arp monitoring */