Blame SOURCES/0001-ipvs-make-nlerr2syserr-libnl-dependent.patch
|
 |
7f924d |
From 71e762fb29a8ba218c90a48e0e160b2bb8b74326 Mon Sep 17 00:00:00 2001
|
|
|
7f924d |
From: Alexandre Cassen <acassen@gmail.com>
|
|
|
7f924d |
Date: Mon, 6 Jan 2014 15:04:28 +0100
|
|
|
7f924d |
Subject: [PATCH 1/7] ipvs: make nlerr2syserr libnl dependent
|
|
|
7f924d |
|
|
|
7f924d |
nlerr2syserr() is only used when libnl is present... simply reflect
|
|
|
7f924d |
this in libipvs.
|
|
|
7f924d |
---
|
|
|
7f924d |
keepalived/libipvs-2.6/libipvs.c | 2 +-
|
|
|
7f924d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7f924d |
|
|
|
7f924d |
diff --git a/keepalived/libipvs-2.6/libipvs.c b/keepalived/libipvs-2.6/libipvs.c
|
|
|
7f924d |
index 223e76b..8ccf94d 100644
|
|
|
7f924d |
--- a/keepalived/libipvs-2.6/libipvs.c
|
|
|
7f924d |
+++ b/keepalived/libipvs-2.6/libipvs.c
|
|
|
7f924d |
@@ -54,6 +54,7 @@ static int family, try_nl = 1;
|
|
|
7f924d |
CHECK_IPV4(s, ret); \
|
|
|
7f924d |
CHECK_PE(s, ret);
|
|
|
7f924d |
|
|
|
7f924d |
+#ifdef LIBIPVS_USE_NL
|
|
|
7f924d |
#ifndef FALLBACK_LIBNL1
|
|
|
7f924d |
static int nlerr2syserr(int err)
|
|
|
7f924d |
{
|
|
|
7f924d |
@@ -79,7 +80,6 @@ static int nlerr2syserr(int err)
|
|
|
7f924d |
}
|
|
|
7f924d |
#endif
|
|
|
7f924d |
|
|
|
7f924d |
-#ifdef LIBIPVS_USE_NL
|
|
|
7f924d |
struct nl_msg *ipvs_nl_message(int cmd, int flags)
|
|
|
7f924d |
{
|
|
|
7f924d |
struct nl_msg *msg;
|
|
|
7f924d |
--
|
|
|
7f924d |
1.8.1.4
|
|
|
7f924d |
|