ipset: unused parameter removal

ipset: unused parameter removal

[Jan Engelhardt]

The following changes since commit 2c76d78838671f1e7da9a0b01703801d8996eb98:

  Merge branch 'master' of git://dev.medozas.de/ipset (2011-01-03 10:07:59 +0100)

are available in the git repository at:

  git://dev.medozas.de/ipset master

Jan Engelhardt (1):
      kernel: remove unused ctnl parameter from call_ad

 kernel/ip_set.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

[PATCH] kernel: remove unused ctnl parameter from call_ad

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 kernel/ip_set.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kernel/ip_set.c b/kernel/ip_set.c
index 6d353d9..85e4e23 100644
--- a/kernel/ip_set.c
+++ b/kernel/ip_set.c
@@ -1315,8 +1315,7 @@ static const struct nla_policy ip_set_adt_policy[IPSET_ATTR_CMD_MAX + 1] = {
 };
 
 static int
-call_ad(struct sock *ctnl, struct sk_buff *skb,
-	const struct nlattr * const attr[],
+call_ad(struct sk_buff *skb, const struct nlattr *const attr[],
 	struct ip_set *set, const struct nlattr *nla,
 	enum ipset_adt adt, u32 flags)
 {
@@ -1372,7 +1371,7 @@ ip_set_uadd(struct sock *ctnl, struct sk_buff *skb,
 		return -EEXIST;
 
 	if (attr[IPSET_ATTR_DATA]) {
-		ret = call_ad(ctnl, skb, attr,
+		ret = call_ad(skb, attr,
 			      set, attr[IPSET_ATTR_DATA], IPSET_ADD, flags);
 	} else {
 		int nla_rem;
@@ -1381,7 +1380,7 @@ ip_set_uadd(struct sock *ctnl, struct sk_buff *skb,
 			if (nla_type(nla) != IPSET_ATTR_DATA
 			    || !flag_nested(nla))
 				return -IPSET_ERR_PROTOCOL;
-			ret = call_ad(ctnl, skb, attr,
+			ret = call_ad(skb, attr,
 				       set, nla, IPSET_ADD, flags);
 			if (ret < 0)
 				return ret;
@@ -1416,7 +1415,7 @@ ip_set_udel(struct sock *ctnl, struct sk_buff *skb,
 		return -EEXIST;
 
 	if (attr[IPSET_ATTR_DATA]) {
-		ret = call_ad(ctnl, skb, attr,
+		ret = call_ad(skb, attr,
 			      set, attr[IPSET_ATTR_DATA], IPSET_DEL, flags);
 	} else {
 		int nla_rem;
@@ -1425,7 +1424,7 @@ ip_set_udel(struct sock *ctnl, struct sk_buff *skb,
 			if (nla_type(nla) != IPSET_ATTR_DATA
 			    || !flag_nested(nla))
 				return -IPSET_ERR_PROTOCOL;
-			ret = call_ad(ctnl, skb, attr,
+			ret = call_ad(skb, attr,
 				       set, nla, IPSET_DEL, flags);
 			if (ret < 0)
 				return ret;
-- 
1.7.1

Re: ipset: unused parameter removal

[Jozsef Kadlecsik]

On Sat, 8 Jan 2011, Jan Engelhardt wrote:

> The following changes since commit 2c76d78838671f1e7da9a0b01703801d8996eb98:
> 
>   Merge branch 'master' of git://dev.medozas.de/ipset (2011-01-03 10:07:59 +0100)
> 
> are available in the git repository at:
> 
>   git://dev.medozas.de/ipset master
> 
> Jan Engelhardt (1):
>       kernel: remove unused ctnl parameter from call_ad
> 
>  kernel/ip_set.c |   11 +++++------
>  1 files changed, 5 insertions(+), 6 deletions(-)

Pulled and pushed, thanks Jan.

Best regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlec@mail.kfki.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
          H-1525 Budapest 114, POB. 49, Hungary