Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / net / decnet / dn_fib.c

diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 7eaf9879972975bec952fa006fb9fd930757f0a6..102d6106a942fc32a8dedb7832711cbe94b4822b 100644 (file)
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -505,6 +505,14 @@ static int dn_fib_check_attr(struct rtmsg *r, struct rtattr **rta)
        return 0;
 }
 
+static inline u32 rtm_get_table(struct rtattr **rta, u8 table)
+{
+       if (rta[RTA_TABLE - 1])
+               table = nla_get_u32((struct nlattr *) rta[RTA_TABLE - 1]);
+
+       return table;
+}
+
 static int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 {
        struct net *net = sock_net(skb->sk);