Page MenuHomeFreeBSD
Files F108630366

D41124.diff
No OneTemporary
Actions

D41124.diff
View Options

diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -2164,13 +2164,10 @@
mld_final_leave(struct in6_multi *inm, struct mld_ifsoftc *mli)
{
struct epoch_tracker et;
- int syncstates;
#ifdef KTR
char ip6tbuf[INET6_ADDRSTRLEN];
#endif
- syncstates = 1;
-
CTR4(KTR_MLD, "%s: final leave %s on ifp %p(%s)",
__func__, ip6_sprintf(ip6tbuf, &inm->in6m_addr),
inm->in6m_ifp, if_name(inm->in6m_ifp));
@@ -2234,7 +2231,6 @@
inm->in6m_state = MLD_LEAVING_MEMBER;
inm->in6m_sctimer = 1;
V_state_change_timers_running6 = 1;
- syncstates = 0;
}
break;
}
@@ -2246,15 +2242,13 @@
break;
}
- if (syncstates) {
- in6m_commit(inm);
- CTR3(KTR_MLD, "%s: T1 -> T0 for %s/%s", __func__,
- ip6_sprintf(ip6tbuf, &inm->in6m_addr),
- if_name(inm->in6m_ifp));
- inm->in6m_st[1].iss_fmode = MCAST_UNDEFINED;
- CTR3(KTR_MLD, "%s: T1 now MCAST_UNDEFINED for %p/%s",
- __func__, &inm->in6m_addr, if_name(inm->in6m_ifp));
- }
+ in6m_commit(inm);
+ CTR3(KTR_MLD, "%s: T1 -> T0 for %s/%s", __func__,
+ ip6_sprintf(ip6tbuf, &inm->in6m_addr),
+ if_name(inm->in6m_ifp));
+ inm->in6m_st[1].iss_fmode = MCAST_UNDEFINED;
+ CTR3(KTR_MLD, "%s: T1 now MCAST_UNDEFINED for %p/%s",
+ __func__, &inm->in6m_addr, if_name(inm->in6m_ifp));
}
/*

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 11:56 PM (9 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16203363
Default Alt Text
D41124.diff (1 KB)

Event Timeline