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 <gregkh@google.com>
Change-Id: If9f449cb74e81d048a1c41b33c6b7c5b564ecaf3
This commit is contained in:
Greg Kroah-Hartman
2020-05-02 09:37:09 +02:00
parent 774168de67
commit 9a92773dc8

View File

@@ -15,6 +15,7 @@
#include <linux/bitmap.h>
#include <linux/compat.h>
#include <linux/android_kabi.h>
#include <uapi/linux/ethtool.h>
#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);