svn commit: r238084 - head/sys/netinet

[Mikolaj Golub]

Author: trociny
Date: Tue Jul  3 19:04:18 2012
New Revision: 238084
URL: http://svn.freebsd.org/changeset/base/238084

Log:
  Don't check for ifp != NULL before KASSERT, as ifp may not be NULL here
  (it is dereferenced below).
  
  Discussed with:	jhb
  MFC after:	1 week

Modified:
  head/sys/netinet/igmp.c

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c	Tue Jul  3 18:59:13 2012	(r238083)
+++ head/sys/netinet/igmp.c	Tue Jul  3 19:04:18 2012	(r238084)
@@ -2285,13 +2285,11 @@ igmp_change_state(struct in_multi *inm)
 	 */
 	KASSERT(inm->inm_ifma != NULL, ("%s: no ifma", __func__));
 	ifp = inm->inm_ifma->ifma_ifp;
-	if (ifp != NULL) {
-		/*
-		 * Sanity check that netinet's notion of ifp is the
-		 * same as net's.
-		 */
-		KASSERT(inm->inm_ifp == ifp, ("%s: bad ifp", __func__));
-	}
+	/*
+	 * Sanity check that netinet's notion of ifp is the
+	 * same as net's.
+	 */
+	KASSERT(inm->inm_ifp == ifp, ("%s: bad ifp", __func__));
 
 	IGMP_LOCK();