From 9a92773dc8cb5978f5894317c25b9763dd389447 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 May 2020 09:37:09 +0200 Subject: [PATCH] ANDROID: GKI: ethtool.h: add Android ABI padding to a structure Try to mitigate potential future driver core api changes by adding a padding to struct ethtool_ops. Based on a change made to the RHEL/CENTOS 8 kernel. Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: If9f449cb74e81d048a1c41b33c6b7c5b564ecaf3 --- include/linux/ethtool.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 6408b446051f..b7b747c4d6e9 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -15,6 +15,7 @@ #include #include +#include #include #ifdef CONFIG_COMPAT @@ -509,6 +510,11 @@ struct ethtool_ops { const struct ethtool_tunable *, void *); int (*set_phy_tunable)(struct net_device *, const struct ethtool_tunable *, const void *); + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; int ethtool_check_ops(const struct ethtool_ops *ops);