Author: baggins Date: Fri Apr 6 20:42:55 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- one more place
---- Files affected:
packages/ipset:
ipset-kernel-3.3.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/ipset/ipset-kernel-3.3.patch
diff -u packages/ipset/ipset-kernel-3.3.patch:1.2
packages/ipset/ipset-kernel-3.3.patch:1.3
--- packages/ipset/ipset-kernel-3.3.patch:1.2 Fri Apr 6 22:39:50 2012
+++ packages/ipset/ipset-kernel-3.3.patch Fri Apr 6 22:42:50 2012
@@ -39,3 +39,25 @@
}
static inline void
+--- ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_net.c.orig
2012-01-12 18:53:09.000000000 +0100
++++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_net.c 2012-04-06
22:42:23.225548191 +0200
+@@ -7,6 +7,7 @@
+
+ /* Kernel module implementing an IP set type: the hash:net type */
+
++#include <linux/version.h>
+ #include <linux/jhash.h>
+ #include <linux/module.h>
+ #include <linux/ip.h>
+@@ -295,7 +296,11 @@
+ hash_net6_data_copy(struct hash_net6_elem *dst,
+ const struct hash_net6_elem *src)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++ dst->ip.in6 = src->ip.in6;
++#else
+ ipv6_addr_copy(&dst->ip.in6, &src->ip.in6);
++#endif
+ dst->cidr = src->cidr;
+ dst->nomatch = src->nomatch;
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/ipset/ipset-kernel-3.3.patch?r1=1.2&r2=1.3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
