Commit 841e9564 authored by Hangbin Liu's avatar Hangbin Liu Committed by David S. Miller
Browse files

bonding: add extra field for bond_opt_value 



Adding an extra storage field for bond_opt_value so we can set large
bytes of data for bonding options in future, e.g. IPv6 address.

Define a new call bond_opt_initextra(). Also change the checking order of
__bond_opt_init() and check values first.

Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1fcd5d44

include/net/bond_options.h

+18 −9
Original line number Original line Diff line number Diff line
@@ -71,14 +71,18 @@ enum { 




/* This structure is used for storing option values and for passing option

/* This structure is used for storing option values and for passing option

 * values when changing an option. The logic when used as an arg is as follows:

 * values when changing an option. The logic when used as an arg is as follows:

 * - if string != NULL -> parse it, if the opt is RAW type then return it, else

 * - if value != ULLONG_MAX -> parse value

 *   return the parse result

 * - if string != NULL -> parse string

 * - if string == NULL -> parse value

 * - if the opt is RAW data and length less than maxlen,

 *   copy the data to extra storage

 */

 */



#define BOND_OPT_EXTRA_MAXLEN 16

struct bond_opt_value {

struct bond_opt_value {

	char *string;

	char *string;

	u64 value;

	u64 value;

	u32 flags;

	u32 flags;

	char extra[BOND_OPT_EXTRA_MAXLEN];

};

};





struct bonding;

struct bonding;
@@ -118,17 +122,22 @@ const struct bond_opt_value *bond_opt_get_val(unsigned int option, u64 val); 
 * When value is ULLONG_MAX then string will be used.

 * When value is ULLONG_MAX then string will be used.

 */

 */

static inline void __bond_opt_init(struct bond_opt_value *optval,

static inline void __bond_opt_init(struct bond_opt_value *optval,

				   char *string, u64 value)

				   char *string, u64 value,

				   void *extra, size_t extra_len)

{

{

	memset(optval, 0, sizeof(*optval));

	memset(optval, 0, sizeof(*optval));

	optval->value = ULLONG_MAX;

	optval->value = ULLONG_MAX;

	if (value == ULLONG_MAX)

	if (value != ULLONG_MAX)

		optval->string = string;

	else

		optval->value = value;

		optval->value = value;

	else if (string)

		optval->string = string;

	else if (extra_len <= BOND_OPT_EXTRA_MAXLEN)

		memcpy(optval->extra, extra, extra_len);

}

}

#define bond_opt_initval(optval, value) __bond_opt_init(optval, NULL, value)

#define bond_opt_initval(optval, value) __bond_opt_init(optval, NULL, value, NULL, 0)

#define bond_opt_initstr(optval, str) __bond_opt_init(optval, str, ULLONG_MAX)

#define bond_opt_initstr(optval, str) __bond_opt_init(optval, str, ULLONG_MAX, NULL, 0)

#define bond_opt_initextra(optval, extra, extra_len) \

	__bond_opt_init(optval, NULL, ULLONG_MAX, extra, extra_len)





void bond_option_arp_ip_targets_clear(struct bonding *bond);

void bond_option_arp_ip_targets_clear(struct bonding *bond);