Commit 2fa70df9 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

decnet: Move rtm_dn_policy to dn_route to make it available if !CONFIG_DECNET_ROUTER 



Otherwise build fails with CONFIG_DECNET && !CONFIG_DECNET_ROUTER

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fe1e04e

net/decnet/dn_fib.c

+0 −14
Original line number Diff line number Diff line
@@ -489,20 +489,6 @@ void dn_fib_select_multipath(const struct flowidn *fld, struct dn_fib_res *res) 
	spin_unlock_bh(&dn_fib_multipath_lock);

}



const struct nla_policy rtm_dn_policy[RTA_MAX + 1] = {

	[RTA_DST]		= { .type = NLA_U16 },

	[RTA_SRC]		= { .type = NLA_U16 },

	[RTA_IIF]		= { .type = NLA_U32 },

	[RTA_OIF]		= { .type = NLA_U32 },

	[RTA_GATEWAY]		= { .type = NLA_U16 },

	[RTA_PRIORITY]		= { .type = NLA_U32 },

	[RTA_PREFSRC]		= { .type = NLA_U16 },

	[RTA_METRICS]		= { .type = NLA_NESTED },

	[RTA_MULTIPATH]		= { .type = NLA_NESTED },

	[RTA_TABLE]		= { .type = NLA_U32 },

	[RTA_MARK]		= { .type = NLA_U32 },

};



static inline u32 rtm_get_table(struct nlattr *attrs[], u8 table)

{

	if (attrs[RTA_TABLE])

net/decnet/dn_route.c

+14 −0
Original line number Diff line number Diff line
@@ -1613,6 +1613,20 @@ static int dn_rt_fill_info(struct sk_buff *skb, u32 portid, u32 seq, 
	return -EMSGSIZE;

}



const struct nla_policy rtm_dn_policy[RTA_MAX + 1] = {

	[RTA_DST]		= { .type = NLA_U16 },

	[RTA_SRC]		= { .type = NLA_U16 },

	[RTA_IIF]		= { .type = NLA_U32 },

	[RTA_OIF]		= { .type = NLA_U32 },

	[RTA_GATEWAY]		= { .type = NLA_U16 },

	[RTA_PRIORITY]		= { .type = NLA_U32 },

	[RTA_PREFSRC]		= { .type = NLA_U16 },

	[RTA_METRICS]		= { .type = NLA_NESTED },

	[RTA_MULTIPATH]		= { .type = NLA_NESTED },

	[RTA_TABLE]		= { .type = NLA_U32 },

	[RTA_MARK]		= { .type = NLA_U32 },

};



/*

 * This is called by both endnodes and routers now.

 */