[SRU][N][PATCH 0/1] Upstream stable patch causes build failure when CONFIG_XFRM_MIGRATE is enabled

[Manuel Diewald]

BugLink: https://bugs.launchpad.net/bugs/2169329

SRU Justification:

[Impact]

This upstream stable patch from v6.12.97

7c30d7f1ba651 ("xfrm: fix NAT-related field inheritance in SA migration")

should not have been included in noble because we're missing

f531d13bdfe3f ("xfrm: support sending NAT keepalives in ESP in UDP states")

which causes the following build failure when CONFIG_XFRM_MIGRATE is
turned on:

error: 'struct xfrm_state' has no member named 'nat_keepalive_interval'

This issue was initially overlooked because the patch applied cleanly
and we have CONFIG_XFRM_MIGRATE turned off for the generic kernel in
noble so build tests didn't trigger the problem. The mapping_maxage part
of the patch is also technically applicable to noble but not worth
keeping as a partial backport.

[Fix]

Revert the patch from the generic noble kernel.

[Test Plan]

Build the kernel with CONFIG_XFRM_MIGRATE enabled (or build
noble:linux-xilinx)

[Where problems could occur]

Problems could be observed in the xfrm subsystem for deployments using
SA migration with NAT traversal.

Manuel Diewald (1):
  UBUNTU: SAUCE: Revert "xfrm: fix NAT-related field inheritance in SA
    migration"

 net/xfrm/xfrm_state.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.34.1