Page MenuHomeFreeBSD

D46020.diff
No OneTemporary

D46020.diff

diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1614,8 +1614,7 @@
struct nhop_object *nh;
nh = rc->rc_nh_old;
-
- if ((nh != NULL) && (nh->nh_flags & NHF_DEFAULT)) {
+ if (rc->rc_cmd == RTM_DELETE && (nh->nh_flags & NHF_DEFAULT) != 0) {
dr = defrouter_lookup(&nh->gw6_sa.sin6_addr, nh->nh_ifp);
if (dr != NULL) {
dr->installed = 0;
@@ -1627,9 +1626,10 @@
void
nd6_subscription_cb(struct rib_head *rnh, struct rib_cmd_info *rc, void *arg)
{
-
#ifdef ROUTE_MPATH
rib_decompose_notification(rc, check_release_defrouter, NULL);
+ if (rc->rc_cmd == RTM_DELETE && !NH_IS_NHGRP(rc->rc_nh_old))
+ check_release_defrouter(rc, NULL);
#else
check_release_defrouter(rc, NULL);
#endif

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 22, 6:56 AM (15 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14771770
Default Alt Text
D46020.diff (759 B)

Event Timeline