diff options
author | Thomas Graf <tgraf@suug.ch> | 2013-03-22 12:50:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-22 12:51:59 -0400 |
commit | 2fa70df935585479f974766d84fa68af462a25a5 (patch) | |
tree | f3966177480406debbf56cc7e3087b8845656e59 /net/decnet | |
parent | 0fe1e04e6206ac849c0fc649484403d0c88a42a5 (diff) |
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) | |||
489 | spin_unlock_bh(&dn_fib_multipath_lock); | 489 | spin_unlock_bh(&dn_fib_multipath_lock); |
490 | } | 490 | } |
491 | 491 | ||
492 | const struct nla_policy rtm_dn_policy[RTA_MAX + 1] = { | ||
493 | [RTA_DST] = { .type = NLA_U16 }, | ||
494 | [RTA_SRC] = { .type = NLA_U16 }, | ||
495 | [RTA_IIF] = { .type = NLA_U32 }, | ||
496 | [RTA_OIF] = { .type = NLA_U32 }, | ||
497 | [RTA_GATEWAY] = { .type = NLA_U16 }, | ||
498 | [RTA_PRIORITY] = { .type = NLA_U32 }, | ||
499 | [RTA_PREFSRC] = { .type = NLA_U16 }, | ||
500 | [RTA_METRICS] = { .type = NLA_NESTED }, | ||
501 | [RTA_MULTIPATH] = { .type = NLA_NESTED }, | ||
502 | [RTA_TABLE] = { .type = NLA_U32 }, | ||
503 | [RTA_MARK] = { .type = NLA_U32 }, | ||
504 | }; | ||
505 | |||
506 | static inline u32 rtm_get_table(struct nlattr *attrs[], u8 table) | 492 | static inline u32 rtm_get_table(struct nlattr *attrs[], u8 table) |
507 | { | 493 | { |
508 | if (attrs[RTA_TABLE]) | 494 | 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: | |||
1613 | return -EMSGSIZE; | 1613 | return -EMSGSIZE; |
1614 | } | 1614 | } |
1615 | 1615 | ||
1616 | const struct nla_policy rtm_dn_policy[RTA_MAX + 1] = { | ||
1617 | [RTA_DST] = { .type = NLA_U16 }, | ||
1618 | [RTA_SRC] = { .type = NLA_U16 }, | ||
1619 | [RTA_IIF] = { .type = NLA_U32 }, | ||
1620 | [RTA_OIF] = { .type = NLA_U32 }, | ||
1621 | [RTA_GATEWAY] = { .type = NLA_U16 }, | ||
1622 | [RTA_PRIORITY] = { .type = NLA_U32 }, | ||
1623 | [RTA_PREFSRC] = { .type = NLA_U16 }, | ||
1624 | [RTA_METRICS] = { .type = NLA_NESTED }, | ||
1625 | [RTA_MULTIPATH] = { .type = NLA_NESTED }, | ||
1626 | [RTA_TABLE] = { .type = NLA_U32 }, | ||
1627 | [RTA_MARK] = { .type = NLA_U32 }, | ||
1628 | }; | ||
1629 | |||
1616 | /* | 1630 | /* |
1617 | * This is called by both endnodes and routers now. | 1631 | * This is called by both endnodes and routers now. |
1618 | */ | 1632 | */ |