|
 |
36cfb7 |
From 9346e08c2f9059decf889fb89f2859e7ed61f573 Mon Sep 17 00:00:00 2001
|
|
|
36cfb7 |
From: Hangbin Liu <haliu@redhat.com>
|
|
|
36cfb7 |
Date: Wed, 8 Nov 2017 14:39:08 +0800
|
|
|
36cfb7 |
Subject: [PATCH] libnetlink: drop unused parameter to rtnl_dump_done
|
|
|
36cfb7 |
|
|
|
36cfb7 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1380803
|
|
|
36cfb7 |
Upstream Status: iproute2.git commit 0efa625765b4
|
|
|
36cfb7 |
|
|
|
36cfb7 |
commit 0efa625765b4481e1e474526eb0feda747b720e5
|
|
|
36cfb7 |
Author: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
36cfb7 |
Date: Thu Aug 24 15:02:32 2017 -0700
|
|
|
36cfb7 |
|
|
|
36cfb7 |
libnetlink: drop unused parameter to rtnl_dump_done
|
|
|
36cfb7 |
|
|
|
36cfb7 |
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
36cfb7 |
|
|
|
36cfb7 |
Signed-off-by: Hangbin Liu <haliu@redhat.com>
|
|
|
36cfb7 |
---
|
|
|
36cfb7 |
lib/libnetlink.c | 5 ++---
|
|
|
36cfb7 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
36cfb7 |
|
|
|
36cfb7 |
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
|
|
|
e138d9 |
index e91bd5a02b956..b08518d81f2dd 100644
|
|
|
36cfb7 |
--- a/lib/libnetlink.c
|
|
|
36cfb7 |
+++ b/lib/libnetlink.c
|
|
|
36cfb7 |
@@ -261,8 +261,7 @@ int rtnl_dump_request_n(struct rtnl_handle *rth, struct nlmsghdr *n)
|
|
|
36cfb7 |
return sendmsg(rth->fd, &msg, 0);
|
|
|
36cfb7 |
}
|
|
|
36cfb7 |
|
|
|
36cfb7 |
-static int rtnl_dump_done(const struct rtnl_handle *rth,
|
|
|
36cfb7 |
- struct nlmsghdr *h)
|
|
|
36cfb7 |
+static int rtnl_dump_done(struct nlmsghdr *h)
|
|
|
36cfb7 |
{
|
|
|
36cfb7 |
int len = *(int *)NLMSG_DATA(h);
|
|
|
36cfb7 |
|
|
|
36cfb7 |
@@ -368,7 +367,7 @@ int rtnl_dump_filter_l(struct rtnl_handle *rth,
|
|
|
36cfb7 |
dump_intr = 1;
|
|
|
36cfb7 |
|
|
|
36cfb7 |
if (h->nlmsg_type == NLMSG_DONE) {
|
|
|
36cfb7 |
- err = rtnl_dump_done(rth, h);
|
|
|
36cfb7 |
+ err = rtnl_dump_done(h);
|
|
|
36cfb7 |
if (err < 0)
|
|
|
36cfb7 |
return -1;
|
|
|
36cfb7 |
|
|
|
36cfb7 |
--
|
|
|
e138d9 |
2.21.0
|
|
|
36cfb7 |
|