Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63e62b2e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: If9f449cb74e81d048a1c41b33c6b7c5b564ecaf3
parent c89d039e

include/linux/ethtool.h

+6 −0
Original line number Diff line number Diff line
@@ -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
@@ -412,5 +413,10 @@ struct ethtool_ops { 
				      struct ethtool_fecparam *);

	void	(*get_ethtool_phy_stats)(struct net_device *,

					 struct ethtool_stats *, u64 *);



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);

	ANDROID_KABI_RESERVE(3);

	ANDROID_KABI_RESERVE(4);

};

#endif /* _LINUX_ETHTOOL_H */