Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a075d1be authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

ANDROID: Fix CRC issue up with xfrm headers in 5.4.174



Two changes to net/xfrm/xfrm_policy.c in the 5.4.174 release ended up
changing the CRC for a xfrm function, despite no actual change
happening.  Fix this up by putting __GENKSYMS__ bounds on the include
files to preserve the CRC.

Bug: 161946584
Fixes: 1e06cb37 ("xfrm: Don't accidentally set RTO_ONLINK in decode_session4()")
Fixes: e8951408 ("xfrm: fix policy lookup for ipv6 gre packets")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia09ea8d4439ec276716396f40dc82c0958624690
parent b3174205
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -31,10 +31,14 @@
#include <linux/if_tunnel.h>
#include <net/dst.h>
#include <net/flow.h>
#ifndef __GENKSYMS__
#include <net/inet_ecn.h>
#endif
#include <net/xfrm.h>
#include <net/ip.h>
#ifndef __GENKSYMS__
#include <net/gre.h>
#endif
#if IS_ENABLED(CONFIG_IPV6_MIP6)
#include <net/mip6.h>
#endif