提交 04af8cf6 编写于 作者: R Rami Rosen 提交者: David S. Miller

net: Remove unused parameter from fill method in fib_rules_ops.

The netlink message header (struct nlmsghdr) is an unused parameter in
fill method of fib_rules_ops struct.  This patch removes this
parameter from this method and fixes the places where this method is
called.

(include/net/fib_rules.h)
Signed-off-by: NRami Rosen <ramirose@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 288ddad5
...@@ -54,7 +54,6 @@ struct fib_rules_ops ...@@ -54,7 +54,6 @@ struct fib_rules_ops
struct fib_rule_hdr *, struct fib_rule_hdr *,
struct nlattr **); struct nlattr **);
int (*fill)(struct fib_rule *, struct sk_buff *, int (*fill)(struct fib_rule *, struct sk_buff *,
struct nlmsghdr *,
struct fib_rule_hdr *); struct fib_rule_hdr *);
u32 (*default_pref)(struct fib_rules_ops *ops); u32 (*default_pref)(struct fib_rules_ops *ops);
size_t (*nlmsg_payload)(struct fib_rule *); size_t (*nlmsg_payload)(struct fib_rule *);
......
...@@ -500,7 +500,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule, ...@@ -500,7 +500,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
if (rule->target) if (rule->target)
NLA_PUT_U32(skb, FRA_GOTO, 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; goto nla_put_failure;
return nlmsg_end(skb, nlh); return nlmsg_end(skb, nlh);
......
...@@ -192,7 +192,7 @@ unsigned dnet_addr_type(__le16 addr) ...@@ -192,7 +192,7 @@ unsigned dnet_addr_type(__le16 addr)
} }
static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb, static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
struct nlmsghdr *nlh, struct fib_rule_hdr *frh) struct fib_rule_hdr *frh)
{ {
struct dn_fib_rule *r = (struct dn_fib_rule *)rule; struct dn_fib_rule *r = (struct dn_fib_rule *)rule;
......
...@@ -209,7 +209,7 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh, ...@@ -209,7 +209,7 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
} }
static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb, static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
struct nlmsghdr *nlh, struct fib_rule_hdr *frh) struct fib_rule_hdr *frh)
{ {
struct fib4_rule *rule4 = (struct fib4_rule *) rule; struct fib4_rule *rule4 = (struct fib4_rule *) rule;
......
...@@ -211,7 +211,7 @@ static int fib6_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh, ...@@ -211,7 +211,7 @@ static int fib6_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
} }
static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb, static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
struct nlmsghdr *nlh, struct fib_rule_hdr *frh) struct fib_rule_hdr *frh)
{ {
struct fib6_rule *rule6 = (struct fib6_rule *) rule; struct fib6_rule *rule6 = (struct fib6_rule *) rule;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册