shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-25 12:00:22 +09:00
Code Issues 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.15.136 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 stg
file to preserve the build.

  5e13e69ddf ("net: release reference to inet6_dev pointer")
  aade10d51d ("net: change accept_ra_min_rtr_lft to affect all RA lifetimes")
  8f12d2d66c ("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
parent e9eafb11e1
commit d87717c9e0
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
android/abi_gki_aarch64.stg
View File

@@ -35447,6 +35447,10 @@ member {
id: 0x2e137f54
type_id: 0x37638d42
}
member {
id: 0x2e3fb8e1
type_id: 0x37d09395
}
member {
id: 0x2e407ff3
type_id: 0x362f8fdc
@@ -35911,6 +35915,11 @@ member {
type_id: 0x5d08323b
offset: 160
}
member {
id: 0x3494a119
type_id: 0x5d7cfe67
offset: 1984
}
member {
id: 0x349c23b4
type_id: 0x5d5ed2a3
@@ -38619,6 +38628,11 @@ member {
type_id: 0x0faae5b1
offset: 704
}
member {
id: 0xbe977230
name: "accept_ra_min_lft"
type_id: 0x0faae5b1
}
member {
id: 0x2c2f941d
name: "accept_ra_mtu"
@@ -131374,6 +131388,12 @@ member {
type_id: 0xc8c766a0
offset: 384
}
member {
id: 0x642f0821
name: "padding"
type_id: 0xc9082b19
offset: 32
}
member {
id: 0x64367333
name: "padding"
@@ -193105,6 +193125,15 @@ struct_union {
member_id: 0xb9227601
}
}
struct_union {
id: 0x37d09395
kind: STRUCT
definition {
bytesize: 8
member_id: 0xbe977230
member_id: 0x642f0821
}
}
struct_union {
id: 0x37f08244
kind: STRUCT
@@ -194865,6 +194894,16 @@ struct_union {
member_id: 0x8c9fd173
}
}
struct_union {
id: 0x5d7cfe67
kind: UNION
definition {
bytesize: 8
member_id: 0x2e3fb8e1
member_id: 0x27000c61
member_id: 0x36752b74
}
}
struct_union {
id: 0x5d84d1ff
kind: UNION
@@ -216229,7 +216268,7 @@ struct_union {
member_id: 0x6180037a
member_id: 0xef330163
member_id: 0x0460772e
member_id: 0x2d0817b6
member_id: 0x3494a119
member_id: 0x63760e20
member_id: 0xac894714
member_id: 0xe0f631d4

4
include/linux/ipv6.h
View File

@@ -34,7 +34,6 @@ struct ipv6_devconf {
__s32 accept_ra_defrtr;
__u32 ra_defrtr_metric;
__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
@@ -85,7 +84,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);