From 0dfb0f3c97c98c164270b56ee592cb0686ffabda Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 29 Nov 2023 14:33:16 +0000 Subject: [PATCH] Revert "inet: shrink struct flowi_common" This reverts commit 612c22e92848e8bf542095120c3ba6b9109394e3 which is commit 1726483b79a72e0150734d5367e4a0238bf8fcff upstream. It only moves things around a structure, AND it saves lots of memory, but in doing so breaks the stable Android ABI, so it must be reverted (Android devices have plenty of kernel memory...) If this is to come back in the future, it can do so in an abi-safe way. Bug: 161946584 Change-Id: I5a5a40c6f6982122d766f3fe5cfde3f3514bc9ae Signed-off-by: Greg Kroah-Hartman --- include/net/flow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/flow.h b/include/net/flow.h index 079cc493fe67..2f0da4f0318b 100644 --- a/include/net/flow.h +++ b/include/net/flow.h @@ -39,8 +39,8 @@ struct flowi_common { #define FLOWI_FLAG_KNOWN_NH 0x02 __u32 flowic_secid; kuid_t flowic_uid; - __u32 flowic_multipath_hash; struct flowi_tunnel flowic_tun_key; + __u32 flowic_multipath_hash; }; union flowi_uli {