From 63caeeae27bc887b1e881bbec15d96b981bb5738 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 29 Aug 2023 08:20:42 +0000 Subject: [PATCH] Revert "xfrm: add forgotten nla_policy for XFRMA_MTIMER_THRESH" This reverts commit 614811692e21cef324d897202ad37c17d4390da3 which is commit 5e2424708da7207087934c5c75211e8584d553a0 upstream. It breaks the build, as the dependant patch, 4e484b3e969b ("xfrm: rate limit SA mapping change message to user space"), was reverted from the Android kernel tree when it was merged from the LTS release it was contained in (5.10.94). So there is nothing to "fix" here in this tree, and it breaks the build with it present. Fixes: 614811692e21 ("xfrm: add forgotten nla_policy for XFRMA_MTIMER_THRESH") Change-Id: I30783bfd7e4b827028cbc27bdc756d8c6e8fb6d5 Signed-off-by: Greg Kroah-Hartman --- net/xfrm/xfrm_user.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 2b0418b74629..7156aae8cf30 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -2653,7 +2653,6 @@ const struct nla_policy xfrma_policy[XFRMA_MAX+1] = { [XFRMA_SET_MARK] = { .type = NLA_U32 }, [XFRMA_SET_MARK_MASK] = { .type = NLA_U32 }, [XFRMA_IF_ID] = { .type = NLA_U32 }, - [XFRMA_MTIMER_THRESH] = { .type = NLA_U32 }, }; EXPORT_SYMBOL_GPL(xfrma_policy);