zebra: Derive VRF Id for slave interfaces correctly

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by:   Don Slice <dslice@cumulusnetworks.com>
Ticket: CM-13195
Reviewed By: CCR-5250
Testing Done: Manual

<DETAILED DESCRIPTION (REPLACE)>

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 87fe019ab0e1a1b98402a9308cc98e0ef249b244..b6bccf2f7bd890460b0093ac23bea4c140168ba2 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -797,11 +797,8 @@ netlink_interface (struct sockaddr_nl *snl, struct nlmsghdr *h,
 
   if (tb[IFLA_MASTER])
     {
-      if ((kind && strcmp(kind, "vrf") == 0) ||
-          (slave_kind && strcmp(slave_kind, "vrf") == 0))
+      if (slave_kind && (strcmp(slave_kind, "vrf") == 0))
         vrf_id = *(u_int32_t *)RTA_DATA(tb[IFLA_MASTER]);
-      else
-       vrf_id = VRF_DEFAULT;
     }
 
   /* Add interface. */
@@ -1495,11 +1492,8 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h,
     {
       if (tb[IFLA_MASTER])
        {
-          if ((kind && strcmp(kind, "vrf") == 0) ||
-              (slave_kind && strcmp(slave_kind, "vrf") == 0))
+          if (slave_kind && (strcmp(slave_kind, "vrf") == 0))
             vrf_id = *(u_int32_t *)RTA_DATA(tb[IFLA_MASTER]);
-         else
-           vrf_id = VRF_DEFAULT;
        }
 
       if (ifp == NULL || !CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))