External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 04:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: make forgotten changes suggested during review of commit d40b820c

Browse Source 
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>
This commit is contained in:
Laine Stump 2019-01-12 16:14:50 -05:00
parent 0f17023ac7
commit 85f223a8f2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/virnetdevip.c
View File

@ -584,18 +584,18 @@ virNetDevIPCheckIPv6ForwardingCallback(struct nlmsghdr *resp,
ifname = virNetDevGetName(nh->rtnh_ifindex);
if (ifname)
accept_ra = virNetDevIPGetAcceptRA(ifname);
if (!ifname)
return -1;
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)
return -1;
}
VIR_FREE(ifname); /* in case it wasn't added to the array */
VIR_FREE(ifname);
data->hasRARoutes = true;
len -= NLMSG_ALIGN(nh->rtnh_len);