diff mbox

[LEDE-DEV] conntrack: enable support for netfilter conntrack zones

Message ID 1463644446-4279-1-git-send-email-alin.nastac@gmail.com
State Accepted
Headers show

Commit Message

Alin Năstac May 19, 2016, 7:54 a.m. UTC 
Storage of such zones is provided by a nf_ct_ext struct, hence conntrack
memory foot print will not be increased if zones are not used.
---
 package/kernel/linux/modules/netfilter.mk | 1 +
 1 file changed, 1 insertion(+)

Comments

Jo-Philipp Wich May 19, 2016, 4:21 p.m. UTC | #1 
Hi Alin,

I merged your patch into my staging tree at

https://git.lede-project.org/?p=lede/jow/staging.git;a=commitdiff;h=6c9231baa9c5341c6ee2e213618dcde72d42288b

Since your change lacked a proper Signed-off-by I added it on your
behalf. Please review the link above and give me your ACK, then I'll
push it to master after some compile testing.

Regards,
Jo

On 05/19/2016 09:54 AM, Alin Nastac wrote:
> Storage of such zones is provided by a nf_ct_ext struct, hence conntrack
> memory foot print will not be increased if zones are not used.
> ---
>  package/kernel/linux/modules/netfilter.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
> index 3b623e4..4d9c116 100644
> --- a/package/kernel/linux/modules/netfilter.mk
> +++ b/package/kernel/linux/modules/netfilter.mk
> @@ -68,6 +68,7 @@ define KernelPackage/nf-conntrack
>    KCONFIG:= \
>          CONFIG_NETFILTER=y \
>          CONFIG_NETFILTER_ADVANCED=y \
> +        CONFIG_NF_CONNTRACK_ZONES=y \
>  	$(KCONFIG_NF_CONNTRACK)
>    FILES:=$(foreach mod,$(NF_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko)
>    AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK-m)))
>
Alin Năstac May 20, 2016, 7:42 a.m. UTC | #2 
Hi Jo,

You have my ACK. ;)
Sorry about that, I will sign my patches from now on.

BR,
Alin

On Thu, May 19, 2016 at 6:21 PM, Jo-Philipp Wich <jo@mein.io> wrote:
> Hi Alin,
>
> I merged your patch into my staging tree at
>
> https://git.lede-project.org/?p=lede/jow/staging.git;a=commitdiff;h=6c9231baa9c5341c6ee2e213618dcde72d42288b
>
> Since your change lacked a proper Signed-off-by I added it on your
> behalf. Please review the link above and give me your ACK, then I'll
> push it to master after some compile testing.
>
> Regards,
> Jo
>
> On 05/19/2016 09:54 AM, Alin Nastac wrote:
>> Storage of such zones is provided by a nf_ct_ext struct, hence conntrack
>> memory foot print will not be increased if zones are not used.
>> ---
>>  package/kernel/linux/modules/netfilter.mk | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
>> index 3b623e4..4d9c116 100644
>> --- a/package/kernel/linux/modules/netfilter.mk
>> +++ b/package/kernel/linux/modules/netfilter.mk
>> @@ -68,6 +68,7 @@ define KernelPackage/nf-conntrack
>>    KCONFIG:= \
>>          CONFIG_NETFILTER=y \
>>          CONFIG_NETFILTER_ADVANCED=y \
>> +        CONFIG_NF_CONNTRACK_ZONES=y \
>>       $(KCONFIG_NF_CONNTRACK)
>>    FILES:=$(foreach mod,$(NF_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko)
>>    AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK-m)))
>>
>
diff mbox

Patch

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 3b623e4..4d9c116 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -68,6 +68,7 @@  define KernelPackage/nf-conntrack
   KCONFIG:= \
         CONFIG_NETFILTER=y \
         CONFIG_NETFILTER_ADVANCED=y \
+        CONFIG_NF_CONNTRACK_ZONES=y \
 	$(KCONFIG_NF_CONNTRACK)
   FILES:=$(foreach mod,$(NF_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK-m)))