diff mbox series

[SRU,J:linux-bluefield,v3] UBUNTU: [Config] bluefield: Enable CONFIG_NF_CONNTRACK as build-in

Message ID 20230502210826.1279340-1-bodong@nvidia.com
State New
Headers show
Series [SRU,J:linux-bluefield,v3] UBUNTU: [Config] bluefield: Enable CONFIG_NF_CONNTRACK as build-in | expand

Commit Message

Bodong Wang May 2, 2023, 9:08 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2017600

CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as
build-in along with CONFIG_NF_CONNTRACK.

Also configure the annotations accordingly.

Signed-off-by: Bodong Wang <bodong@nvidia.com>
---
 debian.bluefield/config/annotations          | 3 +++
 debian.bluefield/config/config.common.ubuntu | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

Comments

Tim Gardner May 3, 2023, 7:16 a.m. UTC | #1 
On 5/2/23 23:08, Bodong Wang wrote:
> BugLink: https://bugs.launchpad.net/bugs/2017600
> 
> CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as
> build-in along with CONFIG_NF_CONNTRACK.
> 
> Also configure the annotations accordingly.
> 
> Signed-off-by: Bodong Wang <bodong@nvidia.com>
> ---
>   debian.bluefield/config/annotations          | 3 +++
>   debian.bluefield/config/config.common.ubuntu | 6 +++---
>   2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/debian.bluefield/config/annotations b/debian.bluefield/config/annotations
> index 401a68cb3bc1..d5835cad4b66 100644
> --- a/debian.bluefield/config/annotations
> +++ b/debian.bluefield/config/annotations
> @@ -3,3 +3,6 @@
>   # ARCH: arm64
>   
>   include "../../debian.master/config/annotations"
> +
> +CONFIG_NF_CONNTRACK                             policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_NF_CONNTRACK                             note<LP: #2017600>
> diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu
> index f5f7959cdf74..04a83149cd7b 100644
> --- a/debian.bluefield/config/config.common.ubuntu
> +++ b/debian.bluefield/config/config.common.ubuntu
> @@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m
>   CONFIG_NFT_TPROXY=m
>   CONFIG_NFT_TUNNEL=m
>   CONFIG_NFT_XFRM=m
> -CONFIG_NF_CONNTRACK=m
> +CONFIG_NF_CONNTRACK=y
>   CONFIG_NF_CONNTRACK_AMANDA=m
>   CONFIG_NF_CONNTRACK_BRIDGE=m
>   CONFIG_NF_CONNTRACK_BROADCAST=m
> @@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y
>   CONFIG_NF_CT_PROTO_GRE=y
>   CONFIG_NF_CT_PROTO_SCTP=y
>   CONFIG_NF_CT_PROTO_UDPLITE=y
> -CONFIG_NF_DEFRAG_IPV4=m
> -CONFIG_NF_DEFRAG_IPV6=m
> +CONFIG_NF_DEFRAG_IPV4=y
> +CONFIG_NF_DEFRAG_IPV6=y
>   CONFIG_NF_DUP_IPV4=m
>   CONFIG_NF_DUP_IPV6=m
>   CONFIG_NF_DUP_NETDEV=m
Acked-by: Tim Gardner <tim.gardner@canonical.com>

Remember to describe your changes from one patch version to the next.
Bartlomiej Zolnierkiewicz May 8, 2023, 2:17 p.m. UTC | #2 
Acked-by: Bartlomiej Zolnierkiewicz <bartlomiej.zolnierkiewicz@canonical.com>

On Tue, May 2, 2023 at 11:09 PM Bodong Wang <bodong@nvidia.com> wrote:
>
> BugLink: https://bugs.launchpad.net/bugs/2017600
>
> CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as
> build-in along with CONFIG_NF_CONNTRACK.
>
> Also configure the annotations accordingly.
>
> Signed-off-by: Bodong Wang <bodong@nvidia.com>
> ---
>  debian.bluefield/config/annotations          | 3 +++
>  debian.bluefield/config/config.common.ubuntu | 6 +++---
>  2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/debian.bluefield/config/annotations b/debian.bluefield/config/annotations
> index 401a68cb3bc1..d5835cad4b66 100644
> --- a/debian.bluefield/config/annotations
> +++ b/debian.bluefield/config/annotations
> @@ -3,3 +3,6 @@
>  # ARCH: arm64
>
>  include "../../debian.master/config/annotations"
> +
> +CONFIG_NF_CONNTRACK                             policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_NF_CONNTRACK                             note<LP: #2017600>
> diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu
> index f5f7959cdf74..04a83149cd7b 100644
> --- a/debian.bluefield/config/config.common.ubuntu
> +++ b/debian.bluefield/config/config.common.ubuntu
> @@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m
>  CONFIG_NFT_TPROXY=m
>  CONFIG_NFT_TUNNEL=m
>  CONFIG_NFT_XFRM=m
> -CONFIG_NF_CONNTRACK=m
> +CONFIG_NF_CONNTRACK=y
>  CONFIG_NF_CONNTRACK_AMANDA=m
>  CONFIG_NF_CONNTRACK_BRIDGE=m
>  CONFIG_NF_CONNTRACK_BROADCAST=m
> @@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y
>  CONFIG_NF_CT_PROTO_GRE=y
>  CONFIG_NF_CT_PROTO_SCTP=y
>  CONFIG_NF_CT_PROTO_UDPLITE=y
> -CONFIG_NF_DEFRAG_IPV4=m
> -CONFIG_NF_DEFRAG_IPV6=m
> +CONFIG_NF_DEFRAG_IPV4=y
> +CONFIG_NF_DEFRAG_IPV6=y
>  CONFIG_NF_DUP_IPV4=m
>  CONFIG_NF_DUP_IPV6=m
>  CONFIG_NF_DUP_NETDEV=m
Bartlomiej Zolnierkiewicz May 9, 2023, 3:38 p.m. UTC | #3 
Applied to jammy:linux-bluefield/master-next. Thanks.

--
Best regards,
Bartlomiej

On Tue, May 2, 2023 at 11:09 PM Bodong Wang <bodong@nvidia.com> wrote:
>
> BugLink: https://bugs.launchpad.net/bugs/2017600
>
> CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as
> build-in along with CONFIG_NF_CONNTRACK.
>
> Also configure the annotations accordingly.
>
> Signed-off-by: Bodong Wang <bodong@nvidia.com>
> ---
>  debian.bluefield/config/annotations          | 3 +++
>  debian.bluefield/config/config.common.ubuntu | 6 +++---
>  2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/debian.bluefield/config/annotations b/debian.bluefield/config/annotations
> index 401a68cb3bc1..d5835cad4b66 100644
> --- a/debian.bluefield/config/annotations
> +++ b/debian.bluefield/config/annotations
> @@ -3,3 +3,6 @@
>  # ARCH: arm64
>
>  include "../../debian.master/config/annotations"
> +
> +CONFIG_NF_CONNTRACK                             policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_NF_CONNTRACK                             note<LP: #2017600>
> diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu
> index f5f7959cdf74..04a83149cd7b 100644
> --- a/debian.bluefield/config/config.common.ubuntu
> +++ b/debian.bluefield/config/config.common.ubuntu
> @@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m
>  CONFIG_NFT_TPROXY=m
>  CONFIG_NFT_TUNNEL=m
>  CONFIG_NFT_XFRM=m
> -CONFIG_NF_CONNTRACK=m
> +CONFIG_NF_CONNTRACK=y
>  CONFIG_NF_CONNTRACK_AMANDA=m
>  CONFIG_NF_CONNTRACK_BRIDGE=m
>  CONFIG_NF_CONNTRACK_BROADCAST=m
> @@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y
>  CONFIG_NF_CT_PROTO_GRE=y
>  CONFIG_NF_CT_PROTO_SCTP=y
>  CONFIG_NF_CT_PROTO_UDPLITE=y
> -CONFIG_NF_DEFRAG_IPV4=m
> -CONFIG_NF_DEFRAG_IPV6=m
> +CONFIG_NF_DEFRAG_IPV4=y
> +CONFIG_NF_DEFRAG_IPV6=y
>  CONFIG_NF_DUP_IPV4=m
>  CONFIG_NF_DUP_IPV6=m
>  CONFIG_NF_DUP_NETDEV=m
diff mbox series

Patch

diff --git a/debian.bluefield/config/annotations b/debian.bluefield/config/annotations
index 401a68cb3bc1..d5835cad4b66 100644
--- a/debian.bluefield/config/annotations
+++ b/debian.bluefield/config/annotations
@@ -3,3 +3,6 @@ 
 # ARCH: arm64
 
 include "../../debian.master/config/annotations"
+
+CONFIG_NF_CONNTRACK                             policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NF_CONNTRACK                             note<LP: #2017600>
diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu
index f5f7959cdf74..04a83149cd7b 100644
--- a/debian.bluefield/config/config.common.ubuntu
+++ b/debian.bluefield/config/config.common.ubuntu
@@ -6138,7 +6138,7 @@  CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_BRIDGE=m
 CONFIG_NF_CONNTRACK_BROADCAST=m
@@ -6166,8 +6166,8 @@  CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_DEFRAG_IPV4=y
+CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m