From dc8506596662fcf2a9aa7942cb1ee081984a23d1 Mon Sep 17 00:00:00 2001
Message-Id: <dc8506596662fcf2a9aa7942cb1ee081984a23d1@dist-git>
From: Laine Stump <laine@laine.org>
Date: Mon, 14 Jan 2019 11:35:06 -0500
Subject: [PATCH] util: make forgotten changes suggested during review of
 commit d40b820c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I had intended to make these changes to commit d40b820c before
pushing, but forgot about it during the day between the initial review
and ACK.

Neither change is significant - just returning immediately when
virNetDevGetName() fails (instead of logging a debug message first)
and eliminating a comment that adds to confusion rather than
eliminating it. Still, the changes should be made to be more
consistent with nearly identical code just a few lines up (added in
commit 7282f455)

Signed-off-by: Laine Stump <laine@laine.org>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit 85f223a8f2480ad446251639a078bb9420072506)

https://bugzilla.redhat.com/1583131

Conflicts: src/util/virnetdevip.c - more context conflicts
Signed-off-by: Laine Stump <laine@laine.org>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/util/virnetdevip.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index fff41ec498..6400887666 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -619,18 +619,18 @@ virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
 
             ifname = virNetDevGetName(nh->rtnh_ifindex);
 
-            if (ifname)
-                accept_ra = virNetDevIPGetAcceptRA(ifname);
+            if (!ifname)
+               goto error;
+
+            accept_ra = virNetDevIPGetAcceptRA(ifname);
 
             VIR_DEBUG("Checking multipath route nexthop device %s (%d), accept_ra: %d",
                       ifname, nh->rtnh_ifindex, accept_ra);
 
-            if (!ifname ||
-                (accept_ra != 2 && virNetDevIPCheckIPv6ForwardingAddIF(data, &ifname) < 0)) {
+            if (accept_ra != 2 && virNetDevIPCheckIPv6ForwardingAddIF(data, &ifname) < 0)
                 goto error;
-            }
 
-            VIR_FREE(ifname); /* in case it wasn't added to the array */
+            VIR_FREE(ifname);
             data->hasRARoutes = true;
 
             len -= NLMSG_ALIGN(nh->rtnh_len);
-- 
2.20.1