diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-10-14 04:10:00 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2019-10-14 04:10:00 +0000 |
| commit | 5df91cbe020a0c1db6ad4e658b9f4c47c4c9284d (patch) | |
| tree | 299f30f1785b9684e0bc5571b82dd390218517ff /sys/netinet/in_mcast.c | |
| parent | 1bb4eefa6cff49df1704c727326095db7d145821 (diff) | |
| download | src-5df91cbe020a0c1db6ad4e658b9f4c47c4c9284d.tar.gz src-5df91cbe020a0c1db6ad4e658b9f4c47c4c9284d.zip | |
Revert r353313. It is not needed with r353357 and is actually incorrect.
Notes
Notes:
svn path=/head/; revision=353484
Diffstat (limited to 'sys/netinet/in_mcast.c')
| -rw-r--r-- | sys/netinet/in_mcast.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 820bff966fcb..9def61fca96a 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -2193,14 +2193,12 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt) * Begin state merge transaction at IGMP layer. */ if (is_new) { - struct epoch_tracker et; - in_pcbref(inp); INP_WUNLOCK(inp); - NET_EPOCH_ENTER(et); + error = in_joingroup_locked(ifp, &gsa->sin.sin_addr, imf, &imf->imf_inm); - NET_EPOCH_EXIT(et); + INP_WLOCK(inp); if (in_pcbrele_wlocked(inp)) { error = ENXIO; |