Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2cb691a authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: use the new options to correctly set last_arp_rx 



Now that the options are in place - arp_validate can be set to receive all
the traffic or only arp packets to verify if the slave is up, when the
slave isn't validated.

CC: Rob Landley <rob@landley.net>
CC: "David S. Miller" <davem@davemloft.net>
CC: Nikolay Aleksandrov <nikolay@redhat.com>
CC: Ding Tianhong <dingtianhong@huawei.com>
CC: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52f65ef3

drivers/net/bonding/bond_main.c

+8 −7
Original line number Diff line number Diff line
@@ -2255,15 +2255,16 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, 
	struct arphdr *arp = (struct arphdr *)skb->data;

	unsigned char *arp_ptr;

	__be32 sip, tip;

	int alen;

	int alen, is_arp = skb->protocol == __cpu_to_be16(ETH_P_ARP);



	if (!slave_do_arp_validate(bond, slave)) {

		if ((slave_do_arp_validate_only(bond, slave) && is_arp) ||

		    !slave_do_arp_validate_only(bond, slave))

			slave->last_arp_rx = jiffies;



	if (skb->protocol != __cpu_to_be16(ETH_P_ARP))

		return RX_HANDLER_ANOTHER;



	if (!slave_do_arp_validate(bond, slave))

		goto out_unlock;

	} else if (!is_arp) {

		return RX_HANDLER_ANOTHER;

	}



	alen = arp_hdr_len(bond->dev);