svn commit: r280100 - head/sys/dev/wpi

[Adrian Chadd]

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 <s3er...@gmail.com>

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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"