[libvirt PATCH 14/21] meson: remove obsolete check for ETHTOOL_GCOALESCE

Daniel P. Berrangé berrange at redhat.com
Thu Dec 8 14:35:18 UTC 2022


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.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 meson.build          |  3 ---
 src/util/virnetdev.c | 15 ---------------
 2 files changed, 18 deletions(-)

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 c2bccf4e49..a73d624453 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
 
 
 /**
-- 
2.38.1



More information about the libvir-list mailing list