diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-05-11 11:50:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-11 11:50:41 -0400 |
| commit | 89dd2e752c7beb773c36e623773d50d5f34da711 (patch) | |
| tree | 07139d8a58c94ef6397d8dccff26ec6ebfa368c4 /include | |
| parent | Merge tag 'linux-can-fixes-for-4.17-20180510' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can (diff) | |
| parent | bonding: send learning packets for vlans on slave (diff) | |
Merge branch 'bonding-bug-fixes-and-regressions'
Debabrata Banerjee says:
====================
bonding: bug fixes and regressions
Fixes to bonding driver for balance-alb mode, suitable for stable.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bonding.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index f801fc940b29..b52235158836 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -198,6 +198,7 @@ struct bonding { struct slave __rcu *primary_slave; struct bond_up_slave __rcu *slave_arr; /* Array of usable slaves */ bool force_primary; + u32 nest_level; s32 slave_cnt; /* never change this value outside the attach/detach wrappers */ int (*recv_probe)(const struct sk_buff *, struct bonding *, struct slave *); |