External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-05 04:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: remove obsolete check for ETHTOOL_GFEATURES

Browse Source 
The ETHTOOL_GFEATURES constant was introduced to Linux in

  commit 5455c6998d34dc983a8693500e4dffefc3682dc5
  Author: Michał Mirosław <mirq-linux@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.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-12-08 09:45:20 +00:00
parent fe2e685ec2
commit 8d18f97ec1
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -650,7 +650,6 @@ symbols = [
# Check whether endian provides handy macros. # Check whether endian provides handy macros.
[ 'endian.h', 'htole64' ], [ 'endian.h', 'htole64' ],
[ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ],
[ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ], [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ],
[ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ], [ 'linux/ethtool.h', 'ETHTOOL_GCOALESCE' ],

13
src/util/virnetdev.c
View File

@ -86,7 +86,7 @@ VIR_LOG_INIT("util.netdev");
#endif #endif
#define RESOURCE_FILE_LEN 4096 #define RESOURCE_FILE_LEN 4096
#if WITH_DECL_ETHTOOL_GFEATURES #ifdef __linux__
# define TX_UDP_TNL 25 # define TX_UDP_TNL 25
# define GFEATURES_SIZE 2 # define GFEATURES_SIZE 2
# define FEATURE_WORD(blocks, index, field) ((blocks)[(index) / 32U].field) # define FEATURE_WORD(blocks, index, field) ((blocks)[(index) / 32U].field)
@ -3264,7 +3264,6 @@ virNetDevSwitchdevFeature(const char *ifname G_GNUC_UNUSED,
# endif # endif
# if WITH_DECL_ETHTOOL_GFEATURES
/** /**
* virNetDevGFeatureAvailable * virNetDevGFeatureAvailable
* This function checks for the availability of a network device gfeature * 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)); ignore_value(virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL));
return 0; 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 # if WITH_DECL_ETHTOOL_SCOALESCE && WITH_DECL_ETHTOOL_GCOALESCE