anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-08 13:44:56 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jan Engelhardt
2011-08-20 16:45:58 +02:00
parent 939d3c8b27
commit 9ccd32d840
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/changelog.txt
View File

@@ -10,6 +10,7 @@ HEAD
- xt_psd: restore functionality with UDP - xt_psd: restore functionality with UDP
- xt_psd: support UDPLITE - xt_psd: support UDPLITE
- update to ipset 6.8 - update to ipset 6.8
- support for Linux 3.1
v1.37 (2011-06-25) v1.37 (2011-06-25)

4
extensions/ipset-6/ip_set_core.c
View File

@@ -1160,9 +1160,13 @@ ip_set_dump(struct sk_buff *skb, struct genl_info *info)
return -IPSET_ERR_PROTOCOL; return -IPSET_ERR_PROTOCOL;
genl_unlock(); 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, ret = netlink_dump_start(ctnl, skb, nlh,
ip_set_dump_start, ip_set_dump_start,
ip_set_dump_done); ip_set_dump_done);
#endif
genl_lock(); genl_lock();
return ret; return ret;
} }