From 8dd316ed565318c5654d572df57138ddaa76d9e0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 Mar 2010 02:37:00 +0100 Subject: [PATCH] Revert "xt_TEE: cosmetic replace a version check" This reverts commit ab13e58f96e759be0f54837a8d5e87ab6bd1b8e9. Whoops. There is no mark at all before 2.6.19. --- extensions/xt_TEE.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/xt_TEE.c b/extensions/xt_TEE.c index 3528d77..c9a4bda 100644 --- a/extensions/xt_TEE.c +++ b/extensions/xt_TEE.c @@ -232,9 +232,10 @@ tee_tg_route6(struct sk_buff *skb, const struct xt_tee_tginfo *info) memset(&fl, 0, sizeof(fl)); fl.iif = skb_ifindex(skb); + /* No mark in flowi before 2.6.19 */ #if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 19) fl.nl_u.ip6_u.fwmark = skb_nfmark(skb); -#else +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) fl.mark = skb_nfmark(skb); #endif fl.nl_u.ip6_u.daddr = info->gw.in6;