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

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

bonding: extend arp_validate to be able to receive unvalidated arp-only traffic 



Currently we can either receive any traffic as a proff of slave being up,
or only *validated* arp traffic (i.e. with src/dst ip checked).

Add an option to be able to specify if we want to receive non-validated arp
traffic only.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3fe68df9

drivers/net/bonding/bond_options.c

+8 −5
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ static struct bond_opt_value bond_arp_validate_tbl[] = { 
	{ "active",		BOND_ARP_VALIDATE_ACTIVE,	0},

	{ "backup",		BOND_ARP_VALIDATE_BACKUP,	0},

	{ "all",		BOND_ARP_VALIDATE_ALL,		0},

	{ "filter",		BOND_ARP_FILTER,		0},

	{ "filter_active",	BOND_ARP_FILTER_ACTIVE,		0},

	{ "filter_backup",	BOND_ARP_FILTER_BACKUP,		0},

	{ NULL,			-1,				0},

};

drivers/net/bonding/bonding.h

+11 −0
Original line number Diff line number Diff line
@@ -342,6 +342,11 @@ static inline bool bond_is_active_slave(struct slave *slave) 
#define BOND_ARP_VALIDATE_BACKUP	(1 << BOND_STATE_BACKUP)

#define BOND_ARP_VALIDATE_ALL		(BOND_ARP_VALIDATE_ACTIVE | \

					 BOND_ARP_VALIDATE_BACKUP)

#define BOND_ARP_FILTER			(BOND_ARP_VALIDATE_ALL + 1)

#define BOND_ARP_FILTER_ACTIVE		(BOND_ARP_VALIDATE_ACTIVE | \

					 BOND_ARP_FILTER)

#define BOND_ARP_FILTER_BACKUP		(BOND_ARP_VALIDATE_BACKUP | \

					 BOND_ARP_FILTER)



static inline int slave_do_arp_validate(struct bonding *bond,

					struct slave *slave)
@@ -349,6 +354,12 @@ static inline int slave_do_arp_validate(struct bonding *bond, 
	return bond->params.arp_validate & (1 << bond_slave_state(slave));

}



static inline int slave_do_arp_validate_only(struct bonding *bond,

					     struct slave *slave)

{

	return bond->params.arp_validate & BOND_ARP_FILTER;

}



/* Get the oldest arp which we've received on this slave for bond's

 * arp_targets.

 */