moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
committed by Carlos Llamas
parent 5d4e30d9b9
commit 5988e691de
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/ethtool.h
View File

@@ -16,6 +16,7 @@
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/android_kabi.h>
#include <uapi/linux/ethtool.h> #include <uapi/linux/ethtool.h>
struct compat_ethtool_rx_flow_spec { struct compat_ethtool_rx_flow_spec {
@@ -705,6 +706,11 @@ struct ethtool_ops {
void (*get_rmon_stats)(struct net_device *dev, void (*get_rmon_stats)(struct net_device *dev,
struct ethtool_rmon_stats *rmon_stats, struct ethtool_rmon_stats *rmon_stats,
const struct ethtool_rmon_hist_range **ranges); const struct ethtool_rmon_hist_range **ranges);
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); int ethtool_check_ops(const struct ethtool_ops *ops);