diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-11 17:48:50 +0000 | 
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-11 17:48:50 +0000 | 
| commit | 58f7553fa424fd0fd74e8b796d50c66014cebebe (patch) | |
| tree | 8aecb1d047b1df2abbfa1ef323d2a724a6a61c77 /net/tipc/netlink.c | |
| parent | dd91c555461261fed220ae29a508f508a0afeb43 (diff) | |
| parent | 9326e4f1e5dd1a4410c429638d3c412b6fc17040 (diff) | |
Merge remote-tracking branch 'spi/for-5.10' into spi-linus
Diffstat (limited to 'net/tipc/netlink.c')
| -rw-r--r-- | net/tipc/netlink.c | 2 | 
1 files changed, 2 insertions, 0 deletions
| diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index c4aee6247d55..c447cb5f879e 100644 --- a/net/tipc/netlink.c +++ b/net/tipc/netlink.c @@ -108,6 +108,8 @@ const struct nla_policy tipc_nl_node_policy[TIPC_NLA_NODE_MAX + 1] = {  					    .len = TIPC_NODEID_LEN},  	[TIPC_NLA_NODE_KEY]		= { .type = NLA_BINARY,  					    .len = TIPC_AEAD_KEY_SIZE_MAX}, +	[TIPC_NLA_NODE_KEY_MASTER]	= { .type = NLA_FLAG }, +	[TIPC_NLA_NODE_REKEYING]	= { .type = NLA_U32 },  };  /* Properties valid for media, bearer and link */ | 
