diff options
| author |   nikolay@redhat.com <nikolay@redhat.com> | 2013-09-07 00:00:26 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-09-11 15:55:17 -0400 |
| commit | 5bb9e0b50d2188d8fac481742d9f801436e2c5ab (patch) | |
| tree | bdf506c0c2ccc9aabe07846151f4ac27b6473644 /drivers/net/bonding/bonding.h | |
| parent | bonding: fix store_arp_validate race with mode change (diff) | |
| download | linux-dev-5bb9e0b50d2188d8fac481742d9f801436e2c5ab.tar.xz linux-dev-5bb9e0b50d2188d8fac481742d9f801436e2c5ab.zip | |
bonding: fix bond_arp_rcv setting and arp validate desync state
We make bond_arp_rcv global so it can be used in bond_sysfs if the bond
interface is up and arp_interval is being changed to a positive value
and cleared otherwise as per Jay's suggestion.
This also fixes a problem where bond_arp_rcv was set even though
arp_validate was disabled while the bond was up by unsetting recv_probe
in bond_store_arp_validate and respectively setting it if enabled.
Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: Marcelo Ricardo Leitner <mleitner@redhat.com>
Acked-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bonding.h')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index f7ab16185f68..7ad8bd5cc947 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -430,6 +430,7 @@ static inline bool slave_can_tx(struct slave *slave) struct bond_net; +int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id); |