You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
1.7 KiB
63 lines
1.7 KiB
7 years ago
|
From 2b0ced9707aae732fabea4b12d7aef65091b56fa Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <2b0ced9707aae732fabea4b12d7aef65091b56fa@dist-git>
|
||
|
|
From: Martin Kletzander <mkletzan@redhat.com>
|
||
|
|
Date: Tue, 25 Apr 2017 13:41:21 +0200
|
||
|
|
Subject: [PATCH] RHEL: Define ETHTOOL_[GS]COALESCE when building on older
|
||
|
|
kernels
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1414627
|
||
|
|
|
||
|
|
RHEL-only (upstream will have this only when built on kernel that
|
||
|
|
supports it).
|
||
|
|
|
||
|
|
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
||
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
---
|
||
|
|
src/util/virnetdev.c | 23 ++++++++---------------
|
||
|
|
1 file changed, 8 insertions(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
|
||
|
|
index b250af9e2c..bc1e70f0a8 100644
|
||
|
|
--- a/src/util/virnetdev.c
|
||
|
|
+++ b/src/util/virnetdev.c
|
||
|
|
@@ -3393,7 +3393,14 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap ATTRIBUTE_UNUSED,
|
||
|
|
# endif
|
||
|
|
|
||
|
|
|
||
|
|
-# if HAVE_DECL_ETHTOOL_SCOALESCE && HAVE_DECL_ETHTOOL_GCOALESCE
|
||
|
|
+/* Workaround for binary distributions building on old kernels */
|
||
|
|
+# ifndef ETHTOOL_GCOALESCE
|
||
|
|
+# define ETHTOOL_GCOALESCE 0x0000000e
|
||
|
|
+# endif
|
||
|
|
+# ifndef ETHTOOL_SCOALESCE
|
||
|
|
+# define ETHTOOL_SCOALESCE 0x0000000f
|
||
|
|
+# endif
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* virNetDevSetCoalesce:
|
||
|
|
* @ifname: interface name to modify
|
||
|
|
@@ -3493,20 +3500,6 @@ int virNetDevSetCoalesce(const char *ifname,
|
||
|
|
VIR_FORCE_CLOSE(fd);
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
-# else
|
||
|
|
-int virNetDevSetCoalesce(const char *ifname,
|
||
|
|
- virNetDevCoalescePtr coalesce,
|
||
|
|
- bool update)
|
||
|
|
-{
|
||
|
|
- if (!coalesce && !update)
|
||
|
|
- return 0;
|
||
|
|
-
|
||
|
|
- virReportSystemError(ENOSYS,
|
||
|
|
- _("Cannot set coalesce info on interface '%s'"),
|
||
|
|
- ifname);
|
||
|
|
- return -1;
|
||
|
|
-}
|
||
|
|
-# endif
|
||
|
|
|
||
|
|
|
||
|
|
/**
|
||
|
|
--
|
||
|
|
2.17.0
|
||
|
|
|