NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 e319ef95b6
commit 0205308795
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/compat.h>
#include <linux/netlink.h>
#include <linux/android_kabi.h>
#include <uapi/linux/ethtool.h>
struct compat_ethtool_rx_flow_spec {
@ -760,6 +761,11 @@ struct ethtool_ops {
int (*set_module_power_mode)(struct net_device *dev,
const struct ethtool_module_power_mode_params *params,
struct netlink_ext_ack *extack);
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);