From 9c4854fa5a552925394f6ab59d0f950b6d64e680 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 18 Mar 2020 09:03:38 +0100 Subject: [PATCH] ANDROID: GKI: phy: add Android ABI padding to some structures Try to mitigate potential future driver core api changes by adding a padding to stuct phy_device and struct phy_driver Inspired by the upstream changes in 5.4.26 and 4.19.111 Bug: 151154716 Signed-off-by: Greg Kroah-Hartman Change-Id: I8dbc5f76e9eddfc5741f944168222aedacd0a8bb --- include/linux/phy.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/linux/phy.h b/include/linux/phy.h index 08725a262f32..afeda1c01e3a 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -645,6 +646,11 @@ struct phy_device { /* MACsec management functions */ const struct macsec_ops *macsec_ops; #endif + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; #define to_phy_device(d) container_of(to_mdio_device(d), \ struct phy_device, mdio) @@ -875,6 +881,9 @@ struct phy_driver { int (*get_sqi)(struct phy_device *dev); /** @get_sqi_max: Get the maximum signal quality indication */ int (*get_sqi_max)(struct phy_device *dev); + + ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); }; #define to_phy_driver(d) container_of(to_mdio_common_driver(d), \ struct phy_driver, mdiodrv)