Revert "xfrm: fix "disable_policy" on ipv4 early demux"
This reverts commit 497653f6d2
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 <gregkh@google.com>
This commit is contained in:
parent
982d7f3eb8
commit
f3226d86f8
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user