package/ipset/patches/001-2.6.35.patch

   1 --- a/kernel/ipt_set.c
   2 +++ b/kernel/ipt_set.c
   3 @@ -83,10 +83,14 @@ match(const struct sk_buff *skb,
   4        int offset,
   5        unsigned int protoff,
   6        bool *hotdrop)
   7 -#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
   8 +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
   9  static bool
  10  match(const struct sk_buff *skb,
  11        const struct xt_match_param *par)
  12 +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
  13 +static bool
  14 +match(const struct sk_buff *skb,
  15 +      struct xt_action_param *par)
  16  #endif
  17  {
  18  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
  19 @@ -136,9 +140,12 @@ checkentry(const char *tablename,
  20            const struct xt_match *match,
  21            void *matchinfo,
  22            unsigned int hook_mask)
  23 -#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
  24 +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
  25  static bool
  26  checkentry(const struct xt_mtchk_param *par)
  27 +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
  28 +static int
  29 +checkentry(const struct xt_mtchk_param *par)
  30  #endif
  31  {
  32  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
  33 --- a/kernel/ipt_SET.c
  34 +++ b/kernel/ipt_SET.c
  35 @@ -64,9 +64,12 @@ target(struct sk_buff *skb,
  36         unsigned int hooknum,
  37         const struct xt_target *target,
  38         const void *targinfo)
  39 -#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
  40 +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
  41  target(struct sk_buff *skb,
  42         const struct xt_target_param *par)
  43 +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
  44 +target(struct sk_buff *skb,
  45 +       const struct xt_action_param *par)
  46  #endif
  47  {
  48  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
  49 @@ -127,9 +130,12 @@ checkentry(const char *tablename,
  50            const struct xt_target *target,
  51            void *targinfo,
  52            unsigned int hook_mask)
  53 -#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
  54 +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
  55  static bool
  56  checkentry(const struct xt_tgchk_param *par)
  57 +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
  58 +static int
  59 +checkentry(const struct xt_tgchk_param *par)
  60  #endif
  61  {
  62  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)