diff options
| author | Mark Brown <broonie@kernel.org> | 2019-05-20 11:54:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-20 11:54:21 +0100 |
| commit | eceb995e04b74204c73f9dd0ccb19061d5082063 (patch) | |
| tree | 265d09722dbaaa4a4c97619d763a40d2be954f16 /net/tipc/core.c | |
| parent | 318dacbd049b447a5b45290b39f1c889b9cbde4d (diff) | |
| parent | a188339ca5a396acc588e5851ed7e19f66b0ebd9 (diff) | |
Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
Diffstat (limited to 'net/tipc/core.c')
| -rw-r--r-- | net/tipc/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 5b38f5164281..27cccd101ef6 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -43,6 +43,7 @@ #include "net.h" #include "socket.h" #include "bcast.h" +#include "node.h" #include <linux/module.h> @@ -59,6 +60,7 @@ static int __net_init tipc_init_net(struct net *net) tn->node_addr = 0; tn->trial_addr = 0; tn->addr_trial_end = 0; + tn->capabilities = TIPC_NODE_CAPABILITIES; memset(tn->node_id, 0, sizeof(tn->node_id)); memset(tn->node_id_string, 0, sizeof(tn->node_id_string)); tn->mon_threshold = TIPC_DEF_MON_THRESHOLD; |
