Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ANDROID: GKI: ethtool.h: add Android ABI padding to a structure

Browse source 
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 c89d039e6b
commit 63e62b2e84
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/linux/ethtool.h
View file

@ -15,6 +15,7 @@
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/android_kabi.h>
#include <uapi/linux/ethtool.h> #include <uapi/linux/ethtool.h>
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
@ -412,5 +413,10 @@ struct ethtool_ops {
struct ethtool_fecparam *); struct ethtool_fecparam *);
void (*get_ethtool_phy_stats)(struct net_device *, void (*get_ethtool_phy_stats)(struct net_device *,
struct ethtool_stats *, u64 *); struct ethtool_stats *, u64 *);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
}; };
#endif /* _LINUX_ETHTOOL_H */ #endif /* _LINUX_ETHTOOL_H */