[libvirt PATCH 13/21] meson: remove obsolete check for ETHTOOL_GFEATURES
The ETHTOOL_GFEATURES constant was introduced to Linux in
commit 5455c6998d34dc983a8693500e4dffefc3682dc5
Author: Michał Mirosław <mirq-linux(a)rere.qmqm.pl>
Date: Tue Feb 15 16:59:17 2011 +0000
net: Introduce new feature setting ops
This is old enough that all our supported platforms can be assumed
to have this feature.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
meson.build | 1 -
src/util/virnetdev.c | 13 +------------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/meson.build b/meson.build
index ff6908d3c4..a3a512a565 100644
--- a/meson.build
+++ b/meson.build
@@ -650,7 +650,6 @@ symbols = [
# Check whether endian provides handy macros.
[ 'endian.h', 'htole64' ],
- [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ],
[ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ],
[ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ],
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 52b8d53ed8..c2bccf4e49 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -86,7 +86,7 @@ VIR_LOG_INIT("util.netdev");
#endif
#define RESOURCE_FILE_LEN 4096
-#if WITH_DECL_ETHTOOL_GFEATURES
+#ifdef __linux__
# define TX_UDP_TNL 25
# define GFEATURES_SIZE 2
# define FEATURE_WORD(blocks, index, field) ((blocks)[(index) / 32U].field)
@@ -3264,7 +3264,6 @@ virNetDevSwitchdevFeature(const char *ifname G_GNUC_UNUSED,
# endif
-# if WITH_DECL_ETHTOOL_GFEATURES
/**
* virNetDevGFeatureAvailable
* This function checks for the availability of a network device gfeature
@@ -3305,16 +3304,6 @@ virNetDevGetEthtoolGFeatures(const char *ifname,
ignore_value(virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL));
return 0;
}
-# else
-static int
-virNetDevGetEthtoolGFeatures(const char *ifname G_GNUC_UNUSED,
- virBitmap *bitmap G_GNUC_UNUSED,
- int fd G_GNUC_UNUSED,
- struct ifreq *ifr G_GNUC_UNUSED)
-{
- return 0;
-}
-# endif
# if WITH_DECL_ETHTOOL_SCOALESCE && WITH_DECL_ETHTOOL_GCOALESCE
--
2.38.1