File lib-fix-extended-ack-with-and-without-libmnl.patch of Package iproute2

Overview Repositories Revisions Requests Users Attributes Meta

File lib-fix-extended-ack-with-and-without-libmnl.patch of Package iproute2 (Revision 10b09744f30dc355771f1440b56f80da)

Currently displaying revision 10b09744f30dc355771f1440b56f80da , Show latest

From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 7 Aug 2017 11:43:21 -0700
Subject: lib: fix extended ack with and without libmnl
Patch-mainline: v4.13.0
Git-commit: 7d23fa55913f6cfb1d2c50b7ccb184abc9b3b60e
References: bsc#1085669

The code was always building without libmnl support, so it was
doing nothing.

Fixes: b6432e68ac2f ("iproute: Add support for extended ack to rtnl_talk")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Michal Kubecek <mkubecek@suse.cz>

---
 Makefile         | 9 +++++++--
 lib/Makefile     | 7 -------
 lib/libnetlink.c | 2 ++
 misc/Makefile    | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index e0ef9232bcf9..6c57f690a54b 100644
--- a/Makefile
+++ b/Makefile
@@ -58,8 +58,13 @@ LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
 LDLIBS += $(LIBNETLINK)
 
 ifeq ($(HAVE_ELF),y)
-CFLAGS += -DHAVE_ELF
-LDLIBS += -lelf
+	CFLAGS += -DHAVE_ELF
+	LDLIBS += -lelf
+endif
+
+ifeq ($(HAVE_MNL),y)
+	CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
+	LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
 endif
 
 all: Config
diff --git a/lib/Makefile b/lib/Makefile
index f81888cca974..1d24ca24b9a3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,13 +4,6 @@ ifeq ($(IP_CONFIG_SETNS),y)
 	CFLAGS += -DHAVE_SETNS
 endif
 
-ifeq ($(HAVE_MNL),y)
-	CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags)
-	LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
-else
-@warn "libmnl required for error support"
-endif
-
 CFLAGS += -fPIC
 
 UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 41353b7dbb31..145de2cb0ccf 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -102,6 +102,8 @@ static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
 	return errfn(errmsg, off, err_nlh);
 }
 #else
+#warning "libmnl required for error support"
+
 /* No extended error ack without libmnl */
 static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
 {
diff --git a/misc/Makefile b/misc/Makefile
index bb9009bdb1f8..ef6a03347893 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -25,16 +25,16 @@ ss: $(SSOBJ)
 	$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
 
 nstat: nstat.o
-	$(QUIET_CC)$(CC) $(LDFLAGS) -o nstat nstat.o $(LIBNETLINK) -lm
+	$(QUIET_CC)$(CC) $(LDFLAGS) -o nstat nstat.o $(LDLIBS) -lm
 
 ifstat: ifstat.o
-	$(QUIET_CC)$(CC) $(LDFLAGS) -o ifstat ifstat.o $(LIBNETLINK) -lm
+	$(QUIET_CC)$(CC) $(LDFLAGS) -o ifstat ifstat.o $(LDLIBS) -lm
 
 rtacct: rtacct.o
-	$(QUIET_CC)$(CC) $(LDFLAGS) -o rtacct rtacct.o $(LIBNETLINK) -lm
+	$(QUIET_CC)$(CC) $(LDFLAGS) -o rtacct rtacct.o $(LDLIBS) -lm
 
 arpd: arpd.o
-	$(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LIBNETLINK) -ldb -lpthread
+	$(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LDLIBS) -ldb -lpthread
 
 ssfilter.c: ssfilter.y
 	$(QUIET_YACC)bison ssfilter.y -o ssfilter.c
-- 
2.16.2

Places

File lib-fix-extended-ack-with-and-without-libmnl.patch of Package iproute2 (Revision 10b09744f30dc355771f1440b56f80da)

Places