xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: fix ABI breakage in struct ipv6_devconf

Browse Source 
The following list of commits, which are in the 5.10.199 release, add a
new field in struct ipv6_devconf and this breaks the abi. Fix this by
using one of the reserved slots for upstream changes and update the xml
file to preserve the build.

  014cab5329 ("net: release reference to inet6_dev pointer")
  d491ac7aa1 ("net: change accept_ra_min_rtr_lft to affect all RA lifetimes")
  354a96770d ("net: add sysctl accept_ra_min_rtr_lft")

type 'struct ipv6_devconf' changed
  member 'union { struct { __s32 accept_ra_min_lft; u32 padding; }; struct { u64 android_kabi_reserved1; }; union { }; }' was added
  member 'u64 android_kabi_reserved1' was removed

Bug: 320243175
Change-Id: Icddcad574f3c29f6d3e63b10f8c7e51bdf46fe7f
Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
Carlos Llamas
2024-02-07 22:17:44 +00:00
committed by Treehugger Robot
parent be6ad5e439
commit 13fdad03e6
2 changed files with 1374 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2725
android/abi_gki_aarch64.xml
View File

File diff suppressed because it is too large Load Diff

4
include/linux/ipv6.h
View File

@@ -33,7 +33,6 @@ struct ipv6_devconf {
__s32 max_addresses;
__s32 accept_ra_defrtr;
__s32 accept_ra_min_hop_limit;
__s32 accept_ra_min_lft;
__s32 accept_ra_pinfo;
__s32 ignore_routes_with_linkdown;
#ifdef CONFIG_IPV6_ROUTER_PREF
@@ -81,7 +80,8 @@ struct ipv6_devconf {
struct ctl_table_header *sysctl_header;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_USE(1, struct { __s32 accept_ra_min_lft; u32 padding; });
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);