patch-kernel_ipt_SET_c 1.1 KB

123456789101112131415161718192021222324252627282930
  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.863658421 +0200
  3. @@ -64,9 +64,12 @@ target(struct sk_buff *skb,
  4. unsigned int hooknum,
  5. const struct xt_target *target,
  6. const void *targinfo)
  7. -#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
  8. +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
  9. target(struct sk_buff *skb,
  10. const struct xt_target_param *par)
  11. +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
  12. +target(struct sk_buff *skb,
  13. + const struct xt_action_param *par)
  14. #endif
  15. {
  16. #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
  17. @@ -127,9 +130,12 @@ checkentry(const char *tablename,
  18. const struct xt_target *target,
  19. void *targinfo,
  20. unsigned int hook_mask)
  21. -#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */
  22. +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
  23. static bool
  24. checkentry(const struct xt_tgchk_param *par)
  25. +#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */
  26. +static int
  27. +checkentry(const struct xt_tgchk_param *par)
  28. #endif
  29. {
  30. #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)