From owner-svn-src-head@FreeBSD.ORG Sun Mar 15 21:11:01 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2EF41D98; Sun, 15 Mar 2015 21:11:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1AD50836; Sun, 15 Mar 2015 21:11:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FLB04s082054; Sun, 15 Mar 2015 21:11:00 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FLB0lW082053; Sun, 15 Mar 2015 21:11:00 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201503152111.t2FLB0lW082053@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 15 Mar 2015 21:11:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280100 - head/sys/dev/wpi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2015 21:11:01 -0000 Author: adrian Date: Sun Mar 15 21:11:00 2015 New Revision: 280100 URL: https://svnweb.freebsd.org/changeset/base/280100 Log: Add more KASSERTs. (Committer note: these checks will have to be re-established in a future commit as /well/ as having the KASSERTs.) PR: kern/197143 Submitted by: Andriy Voskoboinyk Modified: head/sys/dev/wpi/if_wpi.c Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Sun Mar 15 21:09:29 2015 (r280099) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 21:11:00 2015 (r280100) @@ -1931,6 +1931,7 @@ wpi_tx_done(struct wpi_softc *sc, struct int status = le32toh(stat->status); KASSERT(data->ni != NULL, ("no node")); + KASSERT(data->m != NULL, ("no mbuf")); DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_BEGIN, __func__); @@ -3245,10 +3246,10 @@ wpi_add_ibss_node(struct wpi_softc *sc, struct wpi_node *wn = WPI_NODE(ni); int error; - DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__); + KASSERT(wn->id == WPI_ID_UNDEFINED, + ("the node %d was added before", wn->id)); - if (wn->id != WPI_ID_UNDEFINED) - return EINVAL; + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__); if ((wn->id = wpi_add_node_entry_adhoc(sc)) == WPI_ID_UNDEFINED) { device_printf(sc->sc_dev, "%s: h/w table is full\n", __func__); @@ -3271,13 +3272,9 @@ wpi_del_node(struct wpi_softc *sc, struc struct wpi_cmd_del_node node; int error; - DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__); + KASSERT(wn->id != WPI_ID_UNDEFINED, ("undefined node id passed")); - if (wn->id == WPI_ID_UNDEFINED) { - device_printf(sc->sc_dev, "%s: undefined node id passed\n", - __func__); - return; - } + DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__); memset(&node, 0, sizeof node); IEEE80211_ADDR_COPY(node.macaddr, ni->ni_macaddr);