Commit 04af8cf6 authored by Rami Rosen's avatar Rami Rosen Committed by David S. Miller
Browse files

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: default avatarRami Rosen <ramirose@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 288ddad5

include/net/fib_rules.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ struct fib_rules_ops 
					   struct fib_rule_hdr *,

					   struct nlattr **);

	int			(*fill)(struct fib_rule *, struct sk_buff *,

					struct nlmsghdr *,

					struct fib_rule_hdr *);

	u32			(*default_pref)(struct fib_rules_ops *ops);

	size_t			(*nlmsg_payload)(struct fib_rule *);

net/core/fib_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/decnet/dn_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ unsigned dnet_addr_type(__le16 addr) 
}



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;

net/ipv4/fib_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

			  struct nlmsghdr *nlh, struct fib_rule_hdr *frh)

			  struct fib_rule_hdr *frh)

{

	struct fib4_rule *rule4 = (struct fib4_rule *) rule;

net/ipv6/fib6_rules.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

			  struct nlmsghdr *nlh, struct fib_rule_hdr *frh)

			  struct fib_rule_hdr *frh)

{

	struct fib6_rule *rule6 = (struct fib6_rule *) rule;

CRA Git | Maintained and supported by SUSTech CRA and CCSE