mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
ANDROID: GKI: fix crc change in __icmp_send
In the android14-6.1-lts branch, a few new include files were added to net/ipv4/icmp.c, which ended up changing the CRC generation for __icmp_send. This did not show up in the -lts branch as that symbol was not being tracked there, BUT it was added to the non-LTS branch, which caused the mis-match to show up when merging them together. Fix this up by providing the proper __GENKSYMS__ hack to enable the CRC to remain stable. Fixes:eaba5f6743("ipv4: icmp: Unmask upper DSCP bits in icmp_route_lookup()") Fixes:524c341cb1("net/ipv4: add tracepoint for icmp_send") Change-Id: If28644b3fa4c474de4d2b08eef50e84b19685d74 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -93,9 +93,11 @@
|
|||||||
#include <net/ip_fib.h>
|
#include <net/ip_fib.h>
|
||||||
#include <net/l3mdev.h>
|
#include <net/l3mdev.h>
|
||||||
#include <net/addrconf.h>
|
#include <net/addrconf.h>
|
||||||
|
#ifndef __GENKSYMS__
|
||||||
#include <net/inet_dscp.h>
|
#include <net/inet_dscp.h>
|
||||||
#define CREATE_TRACE_POINTS
|
#define CREATE_TRACE_POINTS
|
||||||
#include <trace/events/icmp.h>
|
#include <trace/events/icmp.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Build xmit assembly blocks
|
* Build xmit assembly blocks
|
||||||
|
|||||||
Reference in New Issue
Block a user