From: Jan Engelhardt <jengelh@medozas.de>
To: kadlec@blackhole.kfki.hu
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH] kernel: remove unused ctnl parameter from call_ad
Date: Sat, 8 Jan 2011 04:14:38 +0100 [thread overview]
Message-ID: <1294456479-4401-2-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1294456479-4401-1-git-send-email-jengelh@medozas.de>
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
next prev parent reply other threads:[~2011-01-08 3:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-08 3:14 ipset: unused parameter removal Jan Engelhardt
2011-01-08 3:14 ` Jan Engelhardt [this message]
2011-01-12 12:35 ` Jozsef Kadlecsik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294456479-4401-2-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=kadlec@blackhole.kfki.hu \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).