[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1348648888-24943-10-git-send-email-gaofeng@cn.fujitsu.com>
Date: Wed, 26 Sep 2012 16:41:27 +0800
From: Gao feng <gaofeng@...fujitsu.com>
To: davem@...emloft.net, eric.dumazet@...il.com,
steffen.klassert@...unet.com
Cc: netfilter-devel@...r.kernel.org, linux-rdma@...r.kernel.org,
netdev@...r.kernel.org, linux-crypto@...r.kernel.org,
pablo@...filter.org, stephen.hemminger@...tta.com, jengelh@...i.de,
Gao feng <gaofeng@...fujitsu.com>,
Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu>
Subject: [patch v2 10/11] ipset: pass ipset module to netlink_dump_start
use proper netlink_dump_control.done and .module to avoid panic.
Signed-off-by: Gao feng <gaofeng@...fujitsu.com>
Cc: Jozsef Kadlecsik <kadlec@...ckhole.kfki.hu>
---
net/netfilter/ipset/ip_set_core.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 9730882..c4903dc 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -986,7 +986,7 @@ ip_set_dump_done(struct netlink_callback *cb)
pr_debug("release set %s\n", ip_set_list[cb->args[1]]->name);
ip_set_put_byindex((ip_set_id_t) cb->args[1]);
}
- return 0;
+ return netlink_dump_done(cb);
}
static inline void
@@ -1176,6 +1176,7 @@ ip_set_dump(struct sock *ctnl, struct sk_buff *skb,
struct netlink_dump_control c = {
.dump = ip_set_dump_start,
.done = ip_set_dump_done,
+ .module = THIS_MODULE,
};
return netlink_dump_start(ctnl, skb, nlh, &c);
}
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists