diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-12-24 01:09:58 +0100 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-24 01:09:58 +0100 |
commit | 8b3f91332291fa280a56215f5189baca185998f5 (patch) | |
tree | b89f58972c80ffacf57c4c9cedb5b4b03473c5be /Documentation/networking/bonding.rst | |
parent | Merge tag 'wireless-drivers-next-2021-12-23' of git://git.kernel.org/pub/scm/... (diff) | |
parent | net: stmmac: dwmac-visconti: Fix value of ETHER_CLK_SEL_FREQ_SEL_2P5M (diff) | |
download | linux-8b3f91332291fa280a56215f5189baca185998f5.tar.xz linux-8b3f91332291fa280a56215f5189baca185998f5.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
commit 8f905c0e7354 ("inet: fully convert sk->sk_rx_dst to RCU rules")
commit 43f51df41729 ("net: move early demux fields close to sk_refcnt")
https://lore.kernel.org/all/20211222141641.0caa0ab3@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Documentation/networking/bonding.rst')
-rw-r--r-- | Documentation/networking/bonding.rst | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/networking/bonding.rst b/Documentation/networking/bonding.rst index e5a07cb48f68..ab98373535ea 100644 --- a/Documentation/networking/bonding.rst +++ b/Documentation/networking/bonding.rst @@ -196,11 +196,12 @@ ad_actor_sys_prio ad_actor_system In an AD system, this specifies the mac-address for the actor in - protocol packet exchanges (LACPDUs). The value cannot be NULL or - multicast. It is preferred to have the local-admin bit set for this - mac but driver does not enforce it. If the value is not given then - system defaults to using the masters' mac address as actors' system - address. + protocol packet exchanges (LACPDUs). The value cannot be a multicast + address. If the all-zeroes MAC is specified, bonding will internally + use the MAC of the bond itself. It is preferred to have the + local-admin bit set for this mac but driver does not enforce it. If + the value is not given then system defaults to using the masters' + mac address as actors' system address. This parameter has effect only in 802.3ad mode and is available through SysFs interface. |