diff mbox

[net-next-2.6] cleanup: remove unused parameter from fill method in fib_rules_ops.

Message ID eb3ff54b0905200407x614f5562ubdca848e2bf3a10c@mail.gmail.com
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Rami Rosen May 20, 2009, 11:07 a.m. UTC 
Hi,
  Yes, you are right; sorry again!

(running "git apply --check --whitespace=error-all diff"
did not reveal what you mention, but you are right).

I hope that the attached patch is fully correct now.

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)



Regards,
Rami Rosen


Signed-off-by: Rami Rosen <ramirose@gmail.com>
diff mbox

Patch

diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index b9b6339..ca4b2e8 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -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 *);
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 17d9f49..bd30938 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -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);
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index a2690b1..d70dcb5 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -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;
 
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 38904be..42e7ad5 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -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;
 
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index e1a36db..00a7a5e 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -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;