From 873d24c7b2a0c2e3361a9b7ebfeea8310c906b9e Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 18 Apr 2011 15:25:55 +0000 Subject: [PATCH] make module compile for both 2.6.32 and >= 2.6.35 --- kernel-module/ipt_MEDIAPROXY.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kernel-module/ipt_MEDIAPROXY.c b/kernel-module/ipt_MEDIAPROXY.c index eeeaca47a..468f20c83 100644 --- a/kernel-module/ipt_MEDIAPROXY.c +++ b/kernel-module/ipt_MEDIAPROXY.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -1028,7 +1029,11 @@ drop: +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) +static unsigned int mediaproxy(struct sk_buff *oskb, const struct xt_target_param *par) { +#else static unsigned int mediaproxy(struct sk_buff *oskb, const struct xt_action_param *par) { +#endif const struct ipt_mediaproxy_info *pinfo = par->targinfo; struct sk_buff *skb; struct sk_buff *skb2; @@ -1106,7 +1111,11 @@ skip: +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) +static bool check(const struct xt_tgchk_param *par) { +#else static int check(const struct xt_tgchk_param *par) { +#endif const struct ipt_mediaproxy_info *pinfo = par->targinfo; if (!my_proc_root) {