diff options
author | 2015-05-11 10:59:32 -0400 | |
---|---|---|
committer | 2015-05-11 10:59:32 -0400 | |
commit | 32f89e5c1af2f00159f11707101b8e867d7b6211 (patch) | |
tree | 3dbec503438d0dd8f063a5f62e3dbfe01d3e9791 /lib/test_bpf.c | |
parent | Merge branch 'kernel_socket_netns' (diff) | |
parent | bonding: add netlink support for sys prio, actor sys mac, and port key (diff) | |
download | linux-rng-32f89e5c1af2f00159f11707101b8e867d7b6211.tar.xz linux-rng-32f89e5c1af2f00159f11707101b8e867d7b6211.zip |
Merge branch 'bonding_netlink_lacp'
Jonathan Toppins says:
====================
add netlink support for new lacp bonding parameters
This is a resubmit of Mahesh's last 3 bonding patches from this series
(http://marc.info/?l=linux-netdev&m=142432864626179&w=2) with one
additional kernel patch which adds the netlink bits. I have noted any
modifications I did to the original patches just above my signoff line.
Patch 5 is the iproute2 support for these bonding options. All patches
were coded against the net-next branch of their respective projects.
v2:
* rebased
* only send these new parameters via netlink when bond is in mode 4
* fixed ad_actor_sys_prio to be 0xFFFF by default even when the bond
is initially created in mode 0 and switched to mode 4
v3:
* reverted changes to bond_option_ad_actor_system_set() from v1 in Mahesh's
patch "bonding: Allow userspace to set actors' macaddr in an AD-system."
Instead implementing all setting in the option specific set function as
Nik suggested.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/test_bpf.c')
0 files changed, 0 insertions, 0 deletions