From: Laine Stump <laine@redhat.com>
Date: Tue, 29 Sep 2020 13:43:54 +0000 (-0400)
Subject: build: remove check for MACVLAN_MODE_PASSTHRU
X-Git-Tag: v6.9.0-rc1~417
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fd7c74e446baa91c00fa100036535b20c63fa26;p=thirdparty%2Flibvirt.git

build: remove check for MACVLAN_MODE_PASSTHRU

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>
---

diff --git a/meson.build b/meson.build
index d362b9027b..50b06c323a 100644
--- a/meson.build
+++ b/meson.build
@@ -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'
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index c2bcd6d224..c4c6eeaffc 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -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"