]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
build: remove check for MACVLAN_MODE_PASSTHRU
authorLaine Stump <laine@redhat.com>
Tue, 29 Sep 2020 13:43:54 +0000 (09:43 -0400)
committerLaine Stump <laine@redhat.com>
Thu, 1 Oct 2020 18:02:34 +0000 (14:02 -0400)
macvlan support was added to the Linux kernel in 2.6.33, but
MACVLAN_MODE_PASSTHRU wasn't added until 2.6.38, so a workaround had
been put in place to define that constant on those few systems where
it was missing. It's useful like was probably 6 months at most, but
it's been there for over 10 years.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
meson.build
src/util/virnetdevmacvlan.c

index d362b9027b4bd83767269dbaf2cf66c8aa8c9913..50b06c323a91f70bec24c2b77f04ea734588b7ff 100644 (file)
@@ -1172,10 +1172,6 @@ if not get_option('macvtap').disabled()
 endif
 if use_macvtap
   conf.set('WITH_MACVTAP', 1)
-
-  if cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_PASSTHRU')
-    conf.set('WITH_DECL_MACVLAN_MODE_PASSTHRU', 1)
-  endif
 endif
 
 netcf_version = '0.1.8'
index c2bcd6d22418ea1424672cb14111ad1c7c31a229..c4c6eeaffc2cd0108050ce9c26851194544b7eda 100644 (file)
@@ -47,11 +47,6 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode,
 # include <linux/if_tun.h>
 # include <math.h>
 
-/* Older kernels lacked this enum value.  */
-# if !WITH_DECL_MACVLAN_MODE_PASSTHRU
-#  define MACVLAN_MODE_PASSTHRU 8
-# endif
-
 # include "viralloc.h"
 # include "virlog.h"
 # include "viruuid.h"