On Thu, Dec 08, 2022 at 10:15:27AM -0600, Jonathon Jongsma wrote:
> On 12/8/22 8:35 AM, Daniel P. Berrangé wrote:
> > The ETH_FLAG_NTUPLE constant was introduced to Linux in
> >
> > commit 15682bc488d4af8c9bb998844a94281025e0a333
> > Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
> > 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.
> >
> > Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
> > ---
> > meson.build | 1 -
> > src/util/virnetdev.c | 4 ----
> > 2 files changed, 5 deletions(-)
> >
> > diff --git a/meson.build b/meson.build
> > index 93c8d12264..d9af1ac36a 100644
> > --- 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 b7de487c36..5ef4687191 100644
> > --- 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
>
> Does the fact that this was protected by a symbol named _NTUBLE instead of
> _NTUPLE mean that this code was never actually executed?
Evidentally yes, all the more reason to get rid of pointless
obsolete conditionals :-)
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
