diff options
-rw-r--r-- | include/net/fib_rules.h | 1 | ||||
-rw-r--r-- | net/core/fib_rules.c | 2 | ||||
-rw-r--r-- | net/decnet/dn_rules.c | 2 | ||||
-rw-r--r-- | net/ipv4/fib_rules.c | 2 | ||||
-rw-r--r-- | net/ipv6/fib6_rules.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index c2bb5cae6515..b9b63395d002 100644 --- a/include/net/fib_rules.h +++ b/include/net/fib_rules.h | |||
@@ -48,7 +48,6 @@ struct fib_rules_ops | |||
48 | struct flowi *, int); | 48 | struct flowi *, int); |
49 | int (*configure)(struct fib_rule *, | 49 | int (*configure)(struct fib_rule *, |
50 | struct sk_buff *, | 50 | struct sk_buff *, |
51 | struct nlmsghdr *, | ||
52 | struct fib_rule_hdr *, | 51 | struct fib_rule_hdr *, |
53 | struct nlattr **); | 52 | struct nlattr **); |
54 | int (*compare)(struct fib_rule *, | 53 | int (*compare)(struct fib_rule *, |
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 98691e1466b8..17d9f497b797 100644 --- 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) | |||
299 | } else if (rule->action == FR_ACT_GOTO) | 299 | } else if (rule->action == FR_ACT_GOTO) |
300 | goto errout_free; | 300 | goto errout_free; |
301 | 301 | ||
302 | err = ops->configure(rule, skb, nlh, frh, tb); | 302 | err = ops->configure(rule, skb, frh, tb); |
303 | if (err < 0) | 303 | if (err < 0) |
304 | goto errout_free; | 304 | goto errout_free; |
305 | 305 | ||
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c index 14fbca55e908..a2690b12e03c 100644 --- a/net/decnet/dn_rules.c +++ b/net/decnet/dn_rules.c | |||
@@ -115,7 +115,7 @@ static int dn_fib_rule_match(struct fib_rule *rule, struct flowi *fl, int flags) | |||
115 | } | 115 | } |
116 | 116 | ||
117 | static int dn_fib_rule_configure(struct fib_rule *rule, struct sk_buff *skb, | 117 | static int dn_fib_rule_configure(struct fib_rule *rule, struct sk_buff *skb, |
118 | struct nlmsghdr *nlh, struct fib_rule_hdr *frh, | 118 | struct fib_rule_hdr *frh, |
119 | struct nlattr **tb) | 119 | struct nlattr **tb) |
120 | { | 120 | { |
121 | int err = -EINVAL; | 121 | int err = -EINVAL; |
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index 6080d7120821..38904be4102e 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c | |||
@@ -134,7 +134,7 @@ static const struct nla_policy fib4_rule_policy[FRA_MAX+1] = { | |||
134 | }; | 134 | }; |
135 | 135 | ||
136 | static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb, | 136 | static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb, |
137 | struct nlmsghdr *nlh, struct fib_rule_hdr *frh, | 137 | struct fib_rule_hdr *frh, |
138 | struct nlattr **tb) | 138 | struct nlattr **tb) |
139 | { | 139 | { |
140 | struct net *net = sock_net(skb->sk); | 140 | struct net *net = sock_net(skb->sk); |
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index f5de3f9dc692..e1a36dbb5a27 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c | |||
@@ -151,7 +151,7 @@ static const struct nla_policy fib6_rule_policy[FRA_MAX+1] = { | |||
151 | }; | 151 | }; |
152 | 152 | ||
153 | static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb, | 153 | static int fib6_rule_configure(struct fib_rule *rule, struct sk_buff *skb, |
154 | struct nlmsghdr *nlh, struct fib_rule_hdr *frh, | 154 | struct fib_rule_hdr *frh, |
155 | struct nlattr **tb) | 155 | struct nlattr **tb) |
156 | { | 156 | { |
157 | int err = -EINVAL; | 157 | int err = -EINVAL; |