Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Apr 2013 16:03:22 +0000 (UTC)
From:      "Jayachandran C." <jchandra@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r249409 - head/sys/mips/nlm/dev/net
Message-ID:  <201304121603.r3CG3Mm6061760@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jchandra
Date: Fri Apr 12 16:03:22 2013
New Revision: 249409
URL: http://svnweb.freebsd.org/changeset/base/249409

Log:
  Fix incorrect KASSERTs in xlpge
  
  Fix for crash in Netlogic XLP network accelerator driver when invariants
  are enabled - use correct the condition for KASSERT.

Modified:
  head/sys/mips/nlm/dev/net/xlpge.c

Modified: head/sys/mips/nlm/dev/net/xlpge.c
==============================================================================
--- head/sys/mips/nlm/dev/net/xlpge.c	Fri Apr 12 15:58:53 2013	(r249408)
+++ head/sys/mips/nlm/dev/net/xlpge.c	Fri Apr 12 16:03:22 2013	(r249409)
@@ -975,7 +975,7 @@ nlm_mii_pollstat(void *arg)
 	if (sc->mii_bus) {
 		mii = device_get_softc(sc->mii_bus);
 
-		KASSERT(mii == NULL, ("mii ptr is NULL"));
+		KASSERT(mii != NULL, ("mii ptr is NULL"));
 
 		mii_pollstat(mii);
 
@@ -1143,7 +1143,7 @@ get_buf(void)
 #ifdef INVARIANTS
 	temp1 = vtophys((vm_offset_t) m_new->m_data);
 	temp2 = vtophys((vm_offset_t) m_new->m_data + 1536);
-	KASSERT((temp1 + 1536) != temp2,
+	KASSERT((temp1 + 1536) == temp2,
 	    ("Alloced buffer is not contiguous"));
 #endif
 	return ((void *)m_new->m_data);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304121603.r3CG3Mm6061760>