From 12bc15efbc3974fb31e74ca893edccb4b23a4d52 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 Nov 2023 17:24:34 +0000 Subject: [PATCH] Revert "inet: shrink struct flowi_common" This reverts commit afa49774d8123b4af3a092dc4840c874e568f92c which is commit 1726483b79a72e0150734d5367e4a0238bf8fcff upstream. It breaks the android ABI, and isn't really needed for anything, so drop it for now. Bug: 157965270 Change-Id: Ied13ee54ff6dcc171642fc546f6435169b26df82 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 21e781c74ac5..d058e63fb59a 100644 --- a/include/net/flow.h +++ b/include/net/flow.h @@ -39,8 +39,8 @@ struct flowi_common { #define FLOWI_FLAG_SKIP_NH_OIF 0x04 __u32 flowic_secid; kuid_t flowic_uid; - __u32 flowic_multipath_hash; struct flowi_tunnel flowic_tun_key; + __u32 flowic_multipath_hash; }; union flowi_uli {