From: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu, 8 Dec 2022 09:45:20 +0000 (+0000)
Subject: meson: remove obsolete check for ETHTOOL_GCOALESCE
X-Git-Tag: v9.0.0-rc1~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efb8acb7f74c669eeff44a3a0958837168b323ac;p=thirdparty%2Flibvirt.git

meson: remove obsolete check for ETHTOOL_GCOALESCE

The ETHTOOL_GCOALESCE constant has existed since before Linux moved
to git.

This is old enough that all our supported platforms can be assumed
to have this feature.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/meson.build b/meson.build
index a3a512a565..7fb17bf983 100644
--- a/meson.build
+++ b/meson.build
@@ -650,9 +650,6 @@ symbols = [
   # Check whether endian provides handy macros.
   [ 'endian.h', 'htole64' ],
 
-  [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ],
-  [ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ],
-
   # GET_VLAN_VID_CMD is required for virNetDevGetVLanID
   [ 'linux/if_vlan.h', 'GET_VLAN_VID_CMD' ],
 
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 8da362d905..4be731d1b3 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -3306,7 +3306,6 @@ virNetDevGetEthtoolGFeatures(const char *ifname,
 }
 
 
-# if WITH_DECL_ETHTOOL_SCOALESCE && WITH_DECL_ETHTOOL_GCOALESCE
 /**
  * virNetDevSetCoalesce:
  * @ifname: interface name to modify
@@ -3402,20 +3401,6 @@ int virNetDevSetCoalesce(const char *ifname,
 
     return 0;
 }
-# else
-int virNetDevSetCoalesce(const char *ifname,
-                         virNetDevCoalesce *coalesce,
-                         bool update)
-{
-    if (!coalesce && !update)
-        return 0;
-
-    virReportSystemError(ENOSYS,
-                         _("Cannot set coalesce info on interface '%s'"),
-                         ifname);
-    return -1;
-}
-# endif
 
 
 /**