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

[~andy/linux] / net / core / fib_rules.c

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 98691e1466b80699b664983e5403b4b1a3a19db2..bd309384f8b82dcb928c8236cc2901d39f9cee9f 100644 (file)
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -299,7 +299,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
        } else if (rule->action == FR_ACT_GOTO)
                goto errout_free;
 
-       err = ops->configure(rule, skb, nlh, frh, tb);
+       err = ops->configure(rule, skb, frh, tb);
        if (err < 0)
                goto errout_free;
 
@@ -500,7 +500,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
        if (rule->target)
                NLA_PUT_U32(skb, FRA_GOTO, rule->target);
 
-       if (ops->fill(rule, skb, nlh, frh) < 0)
+       if (ops->fill(rule, skb, frh) < 0)
                goto nla_put_failure;
 
        return nlmsg_end(skb, nlh);