meson: remove obsolete check for ETH_FLAG_NTUPLE

The ETH_FLAG_NTUPLE constant was introduced to Linux in

  commit 15682bc488d4af8c9bb998844a94281025e0a333
  Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
  Date:   Wed Feb 10 20:03:05 2010 -0800

    ethtool: Introduce n-tuple filter programming support

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

A typo in the existing condition "NTUBLE" instead of "NTUPLE" meant the
code was never enabled in the first place, which is an illustration of
why it is worth eliminating redundant conditional checks.

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 93c8d12264e442fc34da338d5d9be01b327a1781..d9af1ac36a7a036f709574fa6cfd94119cbe9abf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -650,7 +650,6 @@ symbols = [
   # Check whether endian provides handy macros.
   [ 'endian.h', 'htole64' ],
 
-  [ 'linux/ethtool.h', 'ETH_FLAG_NTUPLE' ],
   [ 'linux/ethtool.h', 'ETH_FLAG_RXHASH' ],
   [ 'linux/ethtool.h', 'ETHTOOL_GFEATURES' ],
   [ 'linux/ethtool.h', 'ETHTOOL_SCOALESCE' ],

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 926609b8985b217d6e0145551bba0bb531cba0a8..cb304c24592aaa34d854f10bc2e6f28b0035276c 100644 (file)
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -3090,13 +3090,9 @@ virNetDevGetEthtoolFeatures(const char *ifname,
     /* ethtool masks */
     struct virNetDevEthtoolFeatureCmd flags[] = {
         {ETH_FLAG_LRO, VIR_NET_DEV_FEAT_LRO},
-# if WITH_DECL_ETH_FLAG_TXVLAN
         {ETH_FLAG_RXVLAN, VIR_NET_DEV_FEAT_RXVLAN},
         {ETH_FLAG_TXVLAN, VIR_NET_DEV_FEAT_TXVLAN},
-# endif
-# if WITH_DECL_ETH_FLAG_NTUBLE
         {ETH_FLAG_NTUPLE, VIR_NET_DEV_FEAT_NTUPLE},
-# endif
 # if WITH_DECL_ETH_FLAG_RXHASH
         {ETH_FLAG_RXHASH, VIR_NET_DEV_FEAT_RXHASH},
 # endif