Merge pull request #3052 from donaldsharp/dplane_2

Dplane 2

diff --cc zebra/if_netlink.c
index bf5d834278220171f9e60c1a6c9f681219a09157,65d60d8448f179dd7117db1c3150288a08111537..e7ddf68c19500debbe791057a24ca7f2509a80f0
--- 1/zebra/if_netlink.c
--- 2/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@@ -761,14 -759,11 +766,14 @@@ int interface_lookup_netlink(struct zeb
        if (ret < 0)
                return ret;
  
 +      /* fixup linkages */
 +      zebra_if_update_all_links();
 +
        /* Get IPv4 address of the interfaces. */
-       ret = netlink_request_intf_addr(zns, AF_INET, RTM_GETADDR, 0);
+       ret = netlink_request_intf_addr(netlink_cmd, AF_INET, RTM_GETADDR, 0);
        if (ret < 0)
                return ret;
-       ret = netlink_parse_info(netlink_interface_addr, &zns->netlink_cmd, zns,
+       ret = netlink_parse_info(netlink_interface_addr, netlink_cmd, &dp_info,
                                 0, 1);
        if (ret < 0)
                return ret;

diff --cc zebra/rt.h
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/rt_socket.c
Simple merge