From: KOVACS Krisztian <hidden@balabit.hu>
Date: Wed, 15 Dec 2010 22:53:41 +0000 (+0100)
Subject: netfilter: fix compilation when conntrack is disabled but tproxy is enabled
X-Git-Tag: v2.6.39-rc1~468^2~510^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae90bdeaeac6b964b7a1e853a90a19f358a9ac20;p=pandora-kernel.git

netfilter: fix compilation when conntrack is disabled but tproxy is enabled

The IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but
failed to update the #ifdef stanzas guarding the defragmentation related
fields and code in skbuff and conntrack related code in nf_defrag_ipv6.c.

This patch adds the required #ifdefs so that IPv6 tproxy can truly be used
without connection tracking.

Original report:
http://marc.info/?l=linux-netdev&m=129010118516341&w=2

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: KOVACS Krisztian <hidden@balabit.hu>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---

Reading git-diff-tree failed