From e4fb6a3c7d0b21775a23edfef2c88f3a3979a1de Mon Sep 17 00:00:00 2001 From: Gerhard Stenzel Date: Wed, 28 Jul 2010 16:17:21 +0200 Subject: [PATCH] fix handling of PORT_PROFILE_RESPONSE_INPROGRESS netlink message During function test of the 802.1Qbg implementation in lldpad we came across a small problem in the handling of the netlink message corresponding to PORT_PROFILE_RESPONSE_INPROGRESS. This should not result in returning the default rc=1. - src/util/macvtap.c: fix getPortProfileStatus() to return 0 in that case and also fix an indentation problem --- src/util/macvtap.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 635458d336..79a540524a 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -1020,15 +1020,16 @@ getPortProfileStatus(struct nlattr **tb, int32_t vf, if (tb_port[IFLA_PORT_RESPONSE]) { *status = *(uint16_t *)RTA_DATA(tb_port[IFLA_PORT_RESPONSE]); - rc = 0; + rc = 0; } else { - if (is8021Qbg) { - /* no in-progress here; may be missing */ - *status = PORT_PROFILE_RESPONSE_INPROGRESS; - } else { - msg = _("no IFLA_PORT_RESPONSE found in netlink message"); - goto err_exit; - } + if (is8021Qbg) { + /* no in-progress here; may be missing */ + *status = PORT_PROFILE_RESPONSE_INPROGRESS; + rc = 0; + } else { + msg = _("no IFLA_PORT_RESPONSE found in netlink message"); + goto err_exit; + } } err_exit: -- GitLab