diff options
| author | Thomas Graf <tgraf@suug.ch> | 2013-03-22 17:50:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-22 17:51:59 +0100 |
| commit | 2fa70df935585479f974766d84fa68af462a25a5 (patch) | |
| tree | f3966177480406debbf56cc7e3087b8845656e59 /net/decnet | |
| parent | qlcnic: Bump up the version to 5.1.38 (diff) | |
| download | linux-2fa70df935585479f974766d84fa68af462a25a5.tar.xz linux-2fa70df935585479f974766d84fa68af462a25a5.zip | |
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: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
| -rw-r--r-- | net/decnet/dn_fib.c | 14 | ||||
| -rw-r--r-- | net/decnet/dn_route.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index f09305949931..57dc159245ec 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c @@ -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]) diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 5904429e8d6a..fe32388ea24f 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -1613,6 +1613,20 @@ errout: 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. */ |