Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49cc66ea authored by Richard Alpe's avatar Richard Alpe Committed by David S. Miller
Browse files

tipc: move netlink policies to netlink.c 



Make the c files less cluttered and enable netlink attributes to be
shared between files.

Signed-off-by: default avatarRichard Alpe <richard.alpe@ericsson.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Acked-by: default avatarParthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8dfd329f

net/tipc/bearer.c

+1 −17
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "link.h"

#include "discover.h"

#include "bcast.h"

#include "netlink.h"



#define MAX_ADDR_STR 60
@@ -54,23 +55,6 @@ static struct tipc_media * const media_info_array[] = { 
	NULL

};



static const struct nla_policy

tipc_nl_bearer_policy[TIPC_NLA_BEARER_MAX + 1]	= {

	[TIPC_NLA_BEARER_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_BEARER_NAME] = {

		.type = NLA_STRING,

		.len = TIPC_MAX_BEARER_NAME

	},

	[TIPC_NLA_BEARER_PROP]			= { .type = NLA_NESTED },

	[TIPC_NLA_BEARER_DOMAIN]		= { .type = NLA_U32 }

};



static const struct nla_policy tipc_nl_media_policy[TIPC_NLA_MEDIA_MAX + 1] = {

	[TIPC_NLA_MEDIA_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_MEDIA_NAME]		= { .type = NLA_STRING },

	[TIPC_NLA_MEDIA_PROP]		= { .type = NLA_NESTED }

};



static void bearer_disable(struct net *net, struct tipc_bearer *b);



/**

net/tipc/link.c

+0 −8
Original line number Diff line number Diff line
@@ -192,14 +192,6 @@ struct tipc_link { 
static const char *link_co_err = "Link tunneling error, ";

static const char *link_rst_msg = "Resetting link ";



/* Properties valid for media, bearar and link */

static const struct nla_policy tipc_nl_prop_policy[TIPC_NLA_PROP_MAX + 1] = {

	[TIPC_NLA_PROP_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_PROP_PRIO]		= { .type = NLA_U32 },

	[TIPC_NLA_PROP_TOL]		= { .type = NLA_U32 },

	[TIPC_NLA_PROP_WIN]		= { .type = NLA_U32 }

};



/* Send states for broadcast NACKs

 */

enum {

net/tipc/name_table.c

+0 −6
Original line number Diff line number Diff line
@@ -47,12 +47,6 @@ 


#define TIPC_NAMETBL_SIZE 1024		/* must be a power of 2 */



static const struct nla_policy

tipc_nl_name_table_policy[TIPC_NLA_NAME_TABLE_MAX + 1] = {

	[TIPC_NLA_NAME_TABLE_UNSPEC]	= { .type = NLA_UNSPEC },

	[TIPC_NLA_NAME_TABLE_PUBL]	= { .type = NLA_NESTED }

};



/**

 * struct name_info - name sequence publication info

 * @node_list: circular list of publications made by own node

net/tipc/net.c

+1 −5
Original line number Diff line number Diff line
@@ -41,11 +41,7 @@ 
#include "socket.h"

#include "node.h"

#include "bcast.h"



static const struct nla_policy tipc_nl_net_policy[TIPC_NLA_NET_MAX + 1] = {

	[TIPC_NLA_NET_UNSPEC]	= { .type = NLA_UNSPEC },

	[TIPC_NLA_NET_ID]	= { .type = NLA_U32 }

};

#include "netlink.h"



/*

 * The TIPC locking policy is designed to ensure a very fine locking

net/tipc/netlink.c

+69 −0
Original line number Diff line number Diff line
@@ -55,6 +55,75 @@ static const struct nla_policy tipc_nl_policy[TIPC_NLA_MAX + 1] = { 
	[TIPC_NLA_NAME_TABLE]	= { .type = NLA_NESTED, }

};



const struct nla_policy

tipc_nl_name_table_policy[TIPC_NLA_NAME_TABLE_MAX + 1] = {

	[TIPC_NLA_NAME_TABLE_UNSPEC]	= { .type = NLA_UNSPEC },

	[TIPC_NLA_NAME_TABLE_PUBL]	= { .type = NLA_NESTED }

};



const struct nla_policy tipc_nl_sock_policy[TIPC_NLA_SOCK_MAX + 1] = {

	[TIPC_NLA_SOCK_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_SOCK_ADDR]		= { .type = NLA_U32 },

	[TIPC_NLA_SOCK_REF]		= { .type = NLA_U32 },

	[TIPC_NLA_SOCK_CON]		= { .type = NLA_NESTED },

	[TIPC_NLA_SOCK_HAS_PUBL]	= { .type = NLA_FLAG }

};



const struct nla_policy tipc_nl_net_policy[TIPC_NLA_NET_MAX + 1] = {

	[TIPC_NLA_NET_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_NET_ID]		= { .type = NLA_U32 }

};



const struct nla_policy tipc_nl_link_policy[TIPC_NLA_LINK_MAX + 1] = {

	[TIPC_NLA_LINK_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_LINK_NAME]		= { .type = NLA_STRING,

					    .len = TIPC_MAX_LINK_NAME },

	[TIPC_NLA_LINK_MTU]		= { .type = NLA_U32 },

	[TIPC_NLA_LINK_BROADCAST]	= { .type = NLA_FLAG },

	[TIPC_NLA_LINK_UP]		= { .type = NLA_FLAG },

	[TIPC_NLA_LINK_ACTIVE]		= { .type = NLA_FLAG },

	[TIPC_NLA_LINK_PROP]		= { .type = NLA_NESTED },

	[TIPC_NLA_LINK_STATS]		= { .type = NLA_NESTED },

	[TIPC_NLA_LINK_RX]		= { .type = NLA_U32 },

	[TIPC_NLA_LINK_TX]		= { .type = NLA_U32 }

};



const struct nla_policy tipc_nl_node_policy[TIPC_NLA_NODE_MAX + 1] = {

	[TIPC_NLA_NODE_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_NODE_ADDR]		= { .type = NLA_U32 },

	[TIPC_NLA_NODE_UP]		= { .type = NLA_FLAG }

};



/* Properties valid for media, bearer and link */

const struct nla_policy tipc_nl_prop_policy[TIPC_NLA_PROP_MAX + 1] = {

	[TIPC_NLA_PROP_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_PROP_PRIO]		= { .type = NLA_U32 },

	[TIPC_NLA_PROP_TOL]		= { .type = NLA_U32 },

	[TIPC_NLA_PROP_WIN]		= { .type = NLA_U32 }

};



const struct nla_policy tipc_nl_bearer_policy[TIPC_NLA_BEARER_MAX + 1]	= {

	[TIPC_NLA_BEARER_UNSPEC]	= { .type = NLA_UNSPEC },

	[TIPC_NLA_BEARER_NAME]		= { .type = NLA_STRING,

					    .len = TIPC_MAX_BEARER_NAME },

	[TIPC_NLA_BEARER_PROP]		= { .type = NLA_NESTED },

	[TIPC_NLA_BEARER_DOMAIN]	= { .type = NLA_U32 }

};



const struct nla_policy tipc_nl_media_policy[TIPC_NLA_MEDIA_MAX + 1] = {

	[TIPC_NLA_MEDIA_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_MEDIA_NAME]		= { .type = NLA_STRING },

	[TIPC_NLA_MEDIA_PROP]		= { .type = NLA_NESTED }

};



const struct nla_policy tipc_nl_udp_policy[TIPC_NLA_UDP_MAX + 1] = {

	[TIPC_NLA_UDP_UNSPEC]	= {.type = NLA_UNSPEC},

	[TIPC_NLA_UDP_LOCAL]	= {.type = NLA_BINARY,

				   .len = sizeof(struct sockaddr_storage)},

	[TIPC_NLA_UDP_REMOTE]	= {.type = NLA_BINARY,

				   .len = sizeof(struct sockaddr_storage)},

};



/* Users of the legacy API (tipc-config) can't handle that we add operations,

 * so we have a separate genl handling for the new API.

 */