Module Name: src
Committed By: christos
Date: Wed Jan 10 18:51:31 UTC 2018
Modified Files:
src/sys/netinet: ip_output.c
Log Message:
from ozaki-r: use the proper ifp.
XXX: perhaps push the lock in in_delmulti()?
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/sys/netinet/ip_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.291 src/sys/netinet/ip_output.c:1.292
--- src/sys/netinet/ip_output.c:1.291 Wed Jan 10 12:36:06 2018
+++ src/sys/netinet/ip_output.c Wed Jan 10 13:51:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.291 2018/01/10 17:36:06 christos Exp $ */
+/* $NetBSD: ip_output.c,v 1.292 2018/01/10 18:51:31 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.291 2018/01/10 17:36:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.292 2018/01/10 18:51:31 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1906,11 +1906,9 @@ ip_drop_membership(struct ip_moptions *i
* Give up the multicast address record to which the
* membership points.
*/
- if (ifp)
- IFNET_LOCK(ifp);
+ IFNET_LOCK(imo->imo_membership[i]->inm_ifp);
in_delmulti(imo->imo_membership[i]);
- if (ifp)
- IFNET_UNLOCK(ifp);
+ IFNET_UNLOCK(imo->imo_membership[i]->inm_ifp);
/*
* Remove the gap in the membership array.
