patch-kernel_ipt_set_c 1.1 KB

1234567891011121314151617181920212223242526272829303132
  1. --- ipset-4.1.orig/kernel/ipt_set.c 2009-11-10 21:45:41.000000000 +0100
  2. +++ ipset-4.1/kernel/ipt_set.c 2010-08-29 14:45:51.832408251 +0200
  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)