From 9df309a14ac5ae97424d53990961c9f4e533ffef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 28 Apr 2009 10:04:36 +0200 Subject: [PATCH 1/2] iface: remove unused .data field Neither is it anywhere used, but compat_xtables does not provide it either. --- extensions/xt_iface.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/extensions/xt_iface.c b/extensions/xt_iface.c index df3e4a3..b088cfb 100644 --- a/extensions/xt_iface.c +++ b/extensions/xt_iface.c @@ -68,7 +68,6 @@ static struct xt_match xt_iface_mt_reg[] __read_mostly = { .family = NFPROTO_IPV4, .matchsize = XT_ALIGN(sizeof(struct xt_iface_mtinfo)), .match = xt_iface_mt, - .data = 0, .me = THIS_MODULE, }, { @@ -77,7 +76,6 @@ static struct xt_match xt_iface_mt_reg[] __read_mostly = { .family = NFPROTO_IPV6, .matchsize = XT_ALIGN(sizeof(struct xt_iface_mtinfo)), .match = xt_iface_mt, - .data = 0, .me = THIS_MODULE, }, }; From 39655fe83bb713f1c86c10e6c63b220d27de3346 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 28 Apr 2009 10:05:58 +0200 Subject: [PATCH 2/2] iface: fix compilation with <= 2.6.27 Need to include compat_xtables.h to get all the definitions for older kernels. Also, net namespaces are not available before 2.6.24. --- extensions/xt_iface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/extensions/xt_iface.c b/extensions/xt_iface.c index b088cfb..aac85ef 100644 --- a/extensions/xt_iface.c +++ b/extensions/xt_iface.c @@ -11,6 +11,7 @@ #include #include #include "xt_iface.h" +#include "compat_xtables.h" struct xt_iface_flag_pairs { uint16_t iface_flag; @@ -47,7 +48,11 @@ static bool xt_iface_mt(const struct sk_buff *skb, bool retval; int i; - dev = dev_get_by_name(&init_net, info->ifname); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) + dev = dev_get_by_name(&init_net, info->ifname); +#else + dev = dev_get_by_name(info->ifname); +#endif retval = dev != NULL; if (retval) { for (i = 0; i < ARRAY_SIZE(xt_iface_lookup) && retval; ++i) {