Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[sfrench/cifs-2.6.git] / net / ipv4 / ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 37c4f885ff7b6ee8ad9c5b86fa61d2d6f9bbcd78..9f79b9803a161675c5907c1016fd219ad1f33fc9 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -201,7 +201,8 @@ static const struct nla_policy ipmr_rule_policy[FRA_MAX + 1] = {
 };
 
 static int ipmr_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
-                              struct fib_rule_hdr *frh, struct nlattr **tb)
+                              struct fib_rule_hdr *frh, struct nlattr **tb,
+                              struct netlink_ext_ack *extack)
 {
        return 0;
 }