From: Laine Stump Date: Mon, 28 Sep 2020 19:53:48 +0000 (-0400) Subject: util: remove useless checks for IFLA_VF_MAX X-Git-Tag: v6.9.0-rc1~420 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d5748e87afb1cfacaa043c3c34a6865dd8874dc;p=thirdparty%2Flibvirt.git util: remove useless checks for IFLA_VF_MAX IFLA_VF_MAX was introduced to the Linux kernel in 2.6.35, and was even backported to the RHEL*6* 2.6.32 kernel downstream, so it is present in all supported versions of all Linux distros that libvirt builds on. Additionally, it can't be conditionally compiled out of a kernel. There is no reason to conditionalize any piece of code on presence of IFLA_VF_MAX - if the platform is Linux, it is supported. Signed-off-by: Laine Stump Reviewed-by: Michal Privoznik --- diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e1a4cc2bef..07208a1876 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1473,7 +1473,7 @@ virNetDevSysfsFile(char **pf_sysfs_device_link G_GNUC_UNUSED, #endif /* !__linux__ */ -#if defined(__linux__) && defined(WITH_LIBNL) && defined(IFLA_VF_MAX) +#if defined(__linux__) && defined(WITH_LIBNL) static virMacAddr zeroMAC = { .addr = { 0, 0, 0, 0, 0, 0 } }; @@ -2266,7 +2266,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf, } -#else /* defined(__linux__) && defined(WITH_LIBNL) && defined(IFLA_VF_MAX) */ +#else /* defined(__linux__) && defined(WITH_LIBNL) */ int @@ -2309,7 +2309,7 @@ virNetDevSetNetConfig(const char *linkdev G_GNUC_UNUSED, } -#endif /* defined(__linux__) && defined(WITH_LIBNL) && defined(IFLA_VF_MAX) */ +#endif /* defined(__linux__) && defined(WITH_LIBNL) */ VIR_ENUM_IMPL(virNetDevIfState, VIR_NETDEV_IF_STATE_LAST,