diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-30 05:52:29 -0700 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-30 05:52:29 -0700 |
| commit | be5e48abecd137b47e4493a8fd616186c61f48f7 (patch) | |
| tree | 4184faeca4bb606af98deb606d9b53db3ac314b4 /zebra/rt_netlink.h | |
| parent | 526e17284570266dcdd606ff163a614e6b3655a5 (diff) | |
| parent | 2bed4e86e378334341e01f3afe33784ef2713e83 (diff) | |
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
Conflicts:
zebra/rib.h
zebra/zebra_rib.c
zebra/zebra_vty.c
Diffstat (limited to 'zebra/rt_netlink.h')
| -rw-r--r-- | zebra/rt_netlink.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/rt_netlink.h b/zebra/rt_netlink.h index 5b1b48cb0a..d45d22f936 100644 --- a/zebra/rt_netlink.h +++ b/zebra/rt_netlink.h @@ -44,8 +44,8 @@ nl_rtproto_to_str (u_char rtproto); int netlink_neigh_update (int cmd, int ifindex, __u32 addr, char *lla, int llalen); -extern int netlink_route_read(void); -extern int interface_lookup_netlink(void); +extern int interface_lookup_netlink (struct zebra_vrf *zvrf); +extern int netlink_route_read (struct zebra_vrf *zvrf); #endif /* HAVE_NETLINK */ |