ipset-kernel-3.3.patch

   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
  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>
  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