]>
Commit | Line | Data |
---|---|---|
b04ef6fb JR |
1 | --- ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c~ 2012-01-13 21:26:27.000000000 +0100 |
2 | +++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c 2012-04-06 22:33:28.410967308 +0200 | |
3 | @@ -119,9 +119,16 @@ | |
4 | { | |
5 | int protoff; | |
6 | u8 nexthdr; | |
7 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) | |
8 | + __be16 frag_off; | |
9 | +#endif | |
10 | ||
11 | nexthdr = ipv6_hdr(skb)->nexthdr; | |
12 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) | |
13 | + protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr, &frag_off); | |
14 | +#else | |
15 | protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr); | |
16 | +#endif | |
17 | if (protoff < 0) | |
18 | return false; | |
19 | ||
20 | --- ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_ip.c~ 2011-10-04 17:18:10.000000000 +0200 | |
21 | +++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_ip.c 2012-04-06 22:35:56.923721440 +0200 | |
1bcb1afc JR |
22 | @@ -7,6 +7,7 @@ |
23 | ||
24 | /* Kernel module implementing an IP set type: the hash:ip type */ | |
25 | ||
26 | +#include <linux/version.h> | |
27 | #include <linux/jhash.h> | |
28 | #include <linux/module.h> | |
29 | #include <linux/ip.h> | |
b04ef6fb JR |
30 | @@ -241,7 +241,11 @@ |
31 | static inline void | |
32 | hash_ip6_data_copy(struct hash_ip6_elem *dst, const struct hash_ip6_elem *src) | |
33 | { | |
34 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) | |
35 | + dst->ip.in6 = src->ip.in6; | |
36 | +#else | |
37 | ipv6_addr_copy(&dst->ip.in6, &src->ip.in6); | |
38 | +#endif | |
39 | } | |
40 | ||
41 | static inline void | |
3b560298 JR |
42 | --- ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_net.c.orig 2012-01-12 18:53:09.000000000 +0100 |
43 | +++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_hash_net.c 2012-04-06 22:42:23.225548191 +0200 | |
44 | @@ -7,6 +7,7 @@ | |
45 | ||
46 | /* Kernel module implementing an IP set type: the hash:net type */ | |
47 | ||
48 | +#include <linux/version.h> | |
49 | #include <linux/jhash.h> | |
50 | #include <linux/module.h> | |
51 | #include <linux/ip.h> | |
52 | @@ -295,7 +296,11 @@ | |
53 | hash_net6_data_copy(struct hash_net6_elem *dst, | |
54 | const struct hash_net6_elem *src) | |
55 | { | |
56 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) | |
57 | + dst->ip.in6 = src->ip.in6; | |
58 | +#else | |
59 | ipv6_addr_copy(&dst->ip.in6, &src->ip.in6); | |
60 | +#endif | |
61 | dst->cidr = src->cidr; | |
62 | dst->nomatch = src->nomatch; | |
63 | } |