diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 10:16:31 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 10:16:31 (GMT) |
| commit | 9ddd84f872898373c51469f9c931d5aa89fdc807 (patch) | |
| tree | d81f9e396801f04d55924c0d3bbd903fe60ebcda /drivers/net/bonding/bond_options.c | |
| parent | 749d32237bf39e6576dd95bfdf24e4378e51716c (diff) | |
| parent | a4b7f21d7b42b33609df3f86992a8deff80abfaf (diff) | |
| download | linux-9ddd84f872898373c51469f9c931d5aa89fdc807.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'drivers/net/bonding/bond_options.c')
| -rw-r--r-- | drivers/net/bonding/bond_options.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index c378784..298c265 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -121,6 +121,7 @@ static struct bond_opt_value bond_resend_igmp_tbl[] = { static struct bond_opt_value bond_lp_interval_tbl[] = { { "minval", 1, BOND_VALFLAG_MIN | BOND_VALFLAG_DEFAULT}, { "maxval", INT_MAX, BOND_VALFLAG_MAX}, + { NULL, -1, 0}, }; static struct bond_option bond_opts[] = { |