Re: linux-next: Tree for November 18 (netfilter)

From: Patrick McHardy
Date: Wed Dec 15 2010 - 17:55:21 EST


Am 22.11.2010 17:19, schrieb Randy Dunlap:
> On 11/22/10 04:28, KOVACS Krisztian wrote:
>> commit ec0ac6f3e7749e25f481c1e0f75766974820fe84
>> Author: KOVACS Krisztian <hidden@xxxxxxxxxx>
>> Date: Mon Nov 22 13:07:15 2010 +0100
>>
>> 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@xxxxxxxxxx>
>> Signed-off-by: KOVACS Krisztian <hidden@xxxxxxxxxx>
>
> That builds. Thanks.
>
> Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/