diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-31 10:39:54 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-31 10:39:54 -0700 |
| commit | 2f30d8d38448c7ecde96304e3a94dbb5667b8dcc (patch) | |
| tree | 99831498d4e7cc680592a54d3959894eba173067 /zebra/connected.c | |
| parent | f9ca20da1a62324d1ee9c11dd13c71f8986f4909 (diff) | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| download | quagga-2f30d8d38448c7ecde96304e3a94dbb5667b8dcc.tar.bz2 quagga-2f30d8d38448c7ecde96304e3a94dbb5667b8dcc.tar.xz | |
Merge branch 'upstream' into islavista
Conflicts:
ChangeLog
NEWS
bgpd/ChangeLog
bgpd/bgp_attr.c
bgpd/bgp_network.c
bgpd/bgp_packet.c
bgpd/bgp_vty.c
bgpd/bgpd.c
bgpd/bgpd.h
lib/sockopt.c
lib/sockopt.h
lib/zebra.h
mkinstalldirs
zebra/rib.h
zebra/rt_netlink.c
Diffstat (limited to 'zebra/connected.c')
| -rw-r--r-- | zebra/connected.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/zebra/connected.c b/zebra/connected.c index ca22a011..f3e5396c 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -188,15 +188,8 @@ connected_up_ipv4 (struct interface *ifp, struct connected *ifc) if (prefix_ipv4_any (&p)) return; - /* Always push arriving/departing connected routes into the head of - * the working queue to make possible proper validation of the rest - * of the RIB queue (which will contain the whole RIB after the first - * call to rib_update()). - */ - work_queue_aim_head (zebrad.ribq, 1); rib_add_ipv4 (ZEBRA_ROUTE_CONNECT, 0, &p, NULL, NULL, ifp->ifindex, RT_TABLE_MAIN, ifp->metric, 0); - work_queue_aim_head (zebrad.ribq, 0); rib_update (); } @@ -302,9 +295,7 @@ connected_down_ipv4 (struct interface *ifp, struct connected *ifc) return; /* Same logic as for connected_up_ipv4(): push the changes into the head. */ - work_queue_aim_head (zebrad.ribq, 1); rib_delete_ipv4 (ZEBRA_ROUTE_CONNECT, 0, &p, NULL, ifp->ifindex, 0); - work_queue_aim_head (zebrad.ribq, 0); rib_update (); } @@ -349,10 +340,8 @@ connected_up_ipv6 (struct interface *ifp, struct connected *ifc) return; #endif - work_queue_aim_head (zebrad.ribq, 1); rib_add_ipv6 (ZEBRA_ROUTE_CONNECT, 0, &p, NULL, ifp->ifindex, 0, ifp->metric, 0); - work_queue_aim_head (zebrad.ribq, 0); rib_update (); } @@ -426,9 +415,7 @@ connected_down_ipv6 (struct interface *ifp, struct connected *ifc) if (IN6_IS_ADDR_UNSPECIFIED (&p.prefix)) return; - work_queue_aim_head (zebrad.ribq, 1); rib_delete_ipv6 (ZEBRA_ROUTE_CONNECT, 0, &p, NULL, ifp->ifindex, 0); - work_queue_aim_head (zebrad.ribq, 0); rib_update (); } |