From f3226d86f8ce0e172366c5ae7d3eb7a81905fd63 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 6 Dec 2022 19:05:25 +0000 Subject: [PATCH] Revert "xfrm: fix "disable_policy" on ipv4 early demux" This reverts commit 497653f6d2392c8d4abb041f01e1a19781d995d0 which is commit 3a5913183aa1b14148c723bda030e6102ad73008 upstream. It is not needed here as the commit it fixes, e6175a2ed1f1 ("xfrm: fix "disable_policy" flag use when arriving from different devices"), was already reverted from this branch due to ABI issues. Bug: 161946584 Change-Id: I9bcc08425bf73b6fd1dcad8d801ffc728e1021b6 Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_input.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index eccd7897e7aa..f6b3237e88ca 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c @@ -361,11 +361,6 @@ static int ip_rcv_finish_core(struct net *net, struct sock *sk, iph->tos, dev); if (unlikely(err)) goto drop_error; - } else { - struct in_device *in_dev = __in_dev_get_rcu(dev); - - if (in_dev && IN_DEV_ORCONF(in_dev, NOPOLICY)) - IPCB(skb)->flags |= IPSKB_NOPOLICY; } #ifdef CONFIG_IP_ROUTE_CLASSID