ipset: fix compile error due to changed function signature with Linux 3.1

diff --git a/doc/changelog.txt b/doc/changelog.txt
index fc265364b4eb8c275e0958e59807ddffcc20211a..a795a434e84e072835ffa631ec1bb72b2d779036 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -10,6 +10,7 @@ HEAD
 - xt_psd: restore functionality with UDP
 - xt_psd: support UDPLITE
 - update to ipset 6.8
+- support for Linux 3.1
 
 
 v1.37 (2011-06-25)

diff --git a/extensions/ipset-6/ip_set_core.c b/extensions/ipset-6/ip_set_core.c
index 37b872a2434bb6731c02aa37b06570b9d72f5ba5..52181e68b902b769079d1de0760e82f621ba819d 100644 (file)
--- a/extensions/ipset-6/ip_set_core.c
+++ b/extensions/ipset-6/ip_set_core.c
@@ -1160,9 +1160,13 @@ ip_set_dump(struct sk_buff *skb, struct genl_info *info)
                return -IPSET_ERR_PROTOCOL;
 
        genl_unlock();
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
+       ret = netlink_dump_start(ctnl, skb, nlh, ip_set_dump_start, ip_set_dump_done, 0);
+#else
        ret = netlink_dump_start(ctnl, skb, nlh,
                                  ip_set_dump_start,
                                  ip_set_dump_done);
+#endif
        genl_lock();
        return ret;
 }