diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg index ac4d5b6a98dc..f9b494c6777e 100644 --- a/android/abi_gki_aarch64.stg +++ b/android/abi_gki_aarch64.stg @@ -39374,6 +39374,10 @@ member { id: 0x2e1fd5ab type_id: 0x375126bc } +member { + id: 0x2e3fb8e1 + type_id: 0x37d09395 +} member { id: 0x2e407ff3 type_id: 0x362f8fdc @@ -39910,6 +39914,11 @@ member { type_id: 0x5d131624 offset: 64 } +member { + id: 0x3494a41f + type_id: 0x5d7cfe67 + offset: 2048 +} member { id: 0x349c23b4 type_id: 0x5d5ed2a3 @@ -42829,6 +42838,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" @@ -212488,6 +212502,15 @@ struct_union { member_id: 0xd72d8bb2 } } +struct_union { + id: 0x37d09395 + kind: STRUCT + definition { + bytesize: 8 + member_id: 0xbe977230 + member_id: 0x642f0821 + } +} struct_union { id: 0x37f08244 kind: STRUCT @@ -214385,6 +214408,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: 0x5d86aa37 kind: UNION @@ -237987,7 +238020,7 @@ struct_union { member_id: 0xef330e54 member_id: 0xb7f742d4 member_id: 0x04607474 - member_id: 0x2d0812b0 + member_id: 0x3494a41f member_id: 0x637607e0 member_id: 0xac894cc9 member_id: 0xe0f63db8 diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 40365a42fdf8..f9f84a4e4204 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -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 @@ -87,7 +86,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);