diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
| commit | b58ed1f8a89ea32c2380bf79057e5333109d72d4 (patch) | |
| tree | a9ead45b8895edce92ab69621a52816b45725e36 /zebra/connected.c | |
| parent | 01cb1466423363a2f8b42246464feb3858df1c9f (diff) | |
| parent | 5551c072e187c76c3d6a885cd043d6db811bab23 (diff) | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'zebra/connected.c')
| -rw-r--r-- | zebra/connected.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zebra/connected.c b/zebra/connected.c index bc54aab01c..ebd948252e 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -59,10 +59,8 @@ connected_withdraw (struct connected *ifc) if (ifc->address->family == AF_INET) connected_down_ipv4 (ifc->ifp, ifc); -#ifdef HAVE_IPV6 else connected_down_ipv6 (ifc->ifp, ifc); -#endif UNSET_FLAG (ifc->conf, ZEBRA_IFC_REAL); } @@ -103,10 +101,8 @@ connected_announce (struct interface *ifp, struct connected *ifc) { if (ifc->address->family == AF_INET) connected_up_ipv4 (ifp, ifc); -#ifdef HAVE_IPV6 else connected_up_ipv6 (ifp, ifc); -#endif } } |