iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bonding: make IS_IP_TARGET_UNUSABLE_ADDRESS an inline function

Browse Source 
Also, use standard IP primitives to check the address.

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>
This commit is contained in:
Veaceslav Falico 2014-05-15 21:39:56 +02:00 committed by David S. Miller
parent 01844098ec
commit 2807a9feb2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/bonding/bond_main.c
View File

@ -4195,7 +4195,7 @@ static int bond_check_params(struct bond_params *params)
catch mistakes */ catch mistakes */
__be32 ip; __be32 ip;
if (!in4_pton(arp_ip_target[i], -1, (u8 *)&ip, -1, NULL) || if (!in4_pton(arp_ip_target[i], -1, (u8 *)&ip, -1, NULL) ||
IS_IP_TARGET_UNUSABLE_ADDRESS(ip)) { !bond_is_ip_target_ok(ip)) {
pr_warn("Warning: bad arp_ip_target module parameter (%s), ARP monitoring will not be performed\n", pr_warn("Warning: bad arp_ip_target module parameter (%s), ARP monitoring will not be performed\n",
arp_ip_target[i]); arp_ip_target[i]);
arp_interval = 0; arp_interval = 0;

4
drivers/net/bonding/bond_options.c
View File

@ -942,7 +942,7 @@ static int _bond_option_arp_ip_target_add(struct bonding *bond, __be32 target)
__be32 *targets = bond->params.arp_targets; __be32 *targets = bond->params.arp_targets;
int ind; int ind;
if (IS_IP_TARGET_UNUSABLE_ADDRESS(target)) { if (!bond_is_ip_target_ok(target)) {
pr_err("%s: invalid ARP target %pI4 specified for addition\n", pr_err("%s: invalid ARP target %pI4 specified for addition\n",
bond->dev->name, &target); bond->dev->name, &target);
return -EINVAL; return -EINVAL;
@ -987,7 +987,7 @@ static int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target)
unsigned long *targets_rx; unsigned long *targets_rx;
int ind, i; int ind, i;
if (IS_IP_TARGET_UNUSABLE_ADDRESS(target)) { if (!bond_is_ip_target_ok(target)) {
pr_err("%s: invalid ARP target %pI4 specified for removal\n", pr_err("%s: invalid ARP target %pI4 specified for removal\n",
bond->dev->name, &target); bond->dev->name, &target);
return -EINVAL; return -EINVAL;

8
drivers/net/bonding/bonding.h
View File

@ -54,9 +54,6 @@
((slave)->link == BOND_LINK_UP) && \ ((slave)->link == BOND_LINK_UP) && \
bond_is_active_slave(slave)) bond_is_active_slave(slave))
#define IS_IP_TARGET_UNUSABLE_ADDRESS(a) \
((htonl(INADDR_BROADCAST) == a) || \
ipv4_is_zeronet(a))
/* /*
* Less bad way to call ioctl from within the kernel; this needs to be * Less bad way to call ioctl from within the kernel; this needs to be
* done some other way to get the call out of interrupt context. * done some other way to get the call out of interrupt context.
@ -406,6 +403,11 @@ static inline int slave_do_arp_validate_only(struct bonding *bond)
return bond->params.arp_validate & BOND_ARP_FILTER; return bond->params.arp_validate & BOND_ARP_FILTER;
} }
static inline int bond_is_ip_target_ok(__be32 addr)
{
return !ipv4_is_lbcast(addr) && !ipv4_is_zeronet(addr);
}
/* Get the oldest arp which we've received on this slave for bond's /* Get the oldest arp which we've received on this slave for bond's
* arp_targets. * arp_targets.
*/ */