diff options
author | David S. Miller <davem@davemloft.net> | 2017-01-20 18:10:17 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-20 18:10:17 +0100 |
commit | 8d00e20221f5007cc48a45d9706622df03cf8844 (patch) | |
tree | 6e865477ba51e3dd0216c00362e7c3421de1e57b /include | |
parent | bpf: add bpf_probe_read_str helper (diff) | |
parent | tipc: make replicast a user selectable option (diff) | |
download | linux-8d00e20221f5007cc48a45d9706622df03cf8844.tar.xz linux-8d00e20221f5007cc48a45d9706622df03cf8844.zip |
Merge branch 'tipc-multicast-through-replication'
Jon Maloy says:
====================
tipc: emulate multicast through replication
TIPC multicast messages are currently distributed via L2 broadcast
or IP multicast to all nodes in the cluster, irrespective of the
number of real destinations of the message.
In this series we introduce an option to transport messages via
replication ("replicast") across a selected number of unicast links,
instead of relying on the underlying media. This option is used when
true broadcast/multicast is not supported by the media, or when the
number of true destinations is much smaller than the cluster size.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/uapi/linux/tipc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/tipc.h b/include/uapi/linux/tipc.h index bf049e8fe31b..5351b08c897a 100644 --- a/include/uapi/linux/tipc.h +++ b/include/uapi/linux/tipc.h @@ -1,7 +1,7 @@ /* * include/uapi/linux/tipc.h: Header for TIPC socket interface * - * Copyright (c) 2003-2006, Ericsson AB + * Copyright (c) 2003-2006, 2015-2016 Ericsson AB * Copyright (c) 2005, 2010-2011, Wind River Systems * All rights reserved. * @@ -220,7 +220,7 @@ struct sockaddr_tipc { #define TIPC_DESTNAME 3 /* destination name */ /* - * TIPC-specific socket option values + * TIPC-specific socket option names */ #define TIPC_IMPORTANCE 127 /* Default: TIPC_LOW_IMPORTANCE */ @@ -229,6 +229,8 @@ struct sockaddr_tipc { #define TIPC_CONN_TIMEOUT 130 /* Default: 8000 (ms) */ #define TIPC_NODE_RECVQ_DEPTH 131 /* Default: none (read only) */ #define TIPC_SOCK_RECVQ_DEPTH 132 /* Default: none (read only) */ +#define TIPC_MCAST_BROADCAST 133 /* Default: TIPC selects. No arg */ +#define TIPC_MCAST_REPLICAST 134 /* Default: TIPC selects. No arg */ /* * Maximum sizes of TIPC bearer-related names (including terminating NULL) |