From 7a4e857f2bbcd801b4eabff5a19737be503f74a4 Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Wed, 31 May 2023 16:06:54 +0200 Subject: [PATCH] Make igb coalesce workaround conditional --- devices/igb/igb_ethtool-5.14-ethercat.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/devices/igb/igb_ethtool-5.14-ethercat.c b/devices/igb/igb_ethtool-5.14-ethercat.c index c7da1ac7..78c20c1b 100644 --- a/devices/igb/igb_ethtool-5.14-ethercat.c +++ b/devices/igb/igb_ethtool-5.14-ethercat.c @@ -18,6 +18,18 @@ #include "igb-5.14-ethercat.h" + +#ifdef CONFIG_SUSE_KERNEL +#include +#else +# ifndef SUSE_VERSION +# define SUSE_VERSION 0 +# endif +# ifndef SUSE_PATCHLEVEL +# define SUSE_PATCHLEVEL 0 +# endif +#endif + struct igb_stats { char stat_string[ETH_GSTRING_LEN]; int sizeof_stat; @@ -2182,10 +2194,13 @@ static int igb_set_phys_id(struct net_device *netdev, } static int igb_set_coalesce(struct net_device *netdev, +#if SUSE_VERSION == 15 && SUSE_PATCHLEVEL >= 4 struct ethtool_coalesce *ec, struct kernel_ethtool_coalesce *kec, struct netlink_ext_ack *ack) - +#else + struct ethtool_coalesce *ec) +#endif { struct igb_adapter *adapter = netdev_priv(netdev); int i; @@ -2241,10 +2256,13 @@ static int igb_set_coalesce(struct net_device *netdev, } static int igb_get_coalesce(struct net_device *netdev, +#if SUSE_VERSION == 15 && SUSE_PATCHLEVEL >= 4 struct ethtool_coalesce *ec, struct kernel_ethtool_coalesce *kec, struct netlink_ext_ack *ack) - +#else + struct ethtool_coalesce *ec) +#endif { struct igb_adapter *adapter = netdev_priv(netdev);