projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
drivers
/
net
/
bonding
/
bond_options.c
diff --git
a/drivers/net/bonding/bond_options.c
b/drivers/net/bonding/bond_options.c
index 94094b3d5a3eb7250143c0e4a29a71e185d4fac9..540e0167bf24992037165d82c5af307d85f15f02 100644
(file)
--- a/
drivers/net/bonding/bond_options.c
+++ b/
drivers/net/bonding/bond_options.c
@@
-127,6
+127,7
@@
static const struct bond_opt_value bond_fail_over_mac_tbl[] = {
static const struct bond_opt_value bond_intmax_tbl[] = {
{ "off", 0, BOND_VALFLAG_DEFAULT},
{ "maxval", INT_MAX, BOND_VALFLAG_MAX},
+ { NULL, -1, 0}
};
static const struct bond_opt_value bond_lacp_rate_tbl[] = {