net80211: move ieee80211_free_node() call on error from ic_raw_xmit() to ieee80211_ra...

This doesn't free the mbuf upon error; the driver ic_raw_xmit method is still
doing that.

Submitted by:	<s3erios@gmail.com>
Differential Revision:	https://reviews.freebsd.org/D3774

diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index 27a17d2fdcc213dcefdd6db51fdc188d06505eb8..7350bb0a5105832610eea11273fc9a268cf1b748 100644 (file)
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -2452,7 +2452,6 @@ badbad:
        ATH_KTR(sc, ATH_KTR_TX, 2, "ath_raw_xmit: bad0: m=%p, params=%p",
            m, params);
        sc->sc_stats.ast_tx_raw_fail++;
-       ieee80211_free_node(ni);
 
        return error;
 }

diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c
index 0a220a1de5764f6d3f2189b5e11ce29406c24c7a..ebed09c8ac0c1a26105b79424850214ada4da22c 100644 (file)
--- a/sys/dev/bwi/if_bwi.c
+++ b/sys/dev/bwi/if_bwi.c
@@ -1399,7 +1399,6 @@ bwi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        int idx, error;
 
        if ((sc->sc_flags & BWI_F_RUNNING) == 0) {
-               ieee80211_free_node(ni);
                m_freem(m);
                return ENETDOWN;
        }
@@ -1424,9 +1423,7 @@ bwi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
                tbd->tbd_used++;
                tbd->tbd_idx = (idx + 1) % BWI_TX_NDESC;
                sc->sc_tx_timer = 5;
-       } else
-               /* NB: m is reclaimed on encap failure */
-               ieee80211_free_node(ni);
+       }
        BWI_UNLOCK(sc);
        return error;
 }

diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index 15f6f27a0a5a38d8654a89e1d0613f35391c63ec..0746a8ebf6365e1c1751d2e86782f7760445ec7a 100644 (file)
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -2684,29 +2684,26 @@ bwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        struct ieee80211com *ic = ni->ni_ic;
        struct bwn_softc *sc = ic->ic_softc;
        struct bwn_mac *mac = sc->sc_curmac;
+       int error;
 
        if ((sc->sc_flags & BWN_FLAG_RUNNING) == 0 ||
            mac->mac_status < BWN_MAC_STATUS_STARTED) {
-               ieee80211_free_node(ni);
                m_freem(m);
                return (ENETDOWN);
        }
 
        BWN_LOCK(sc);
        if (bwn_tx_isfull(sc, m)) {
-               ieee80211_free_node(ni);
                m_freem(m);
                BWN_UNLOCK(sc);
                return (ENOBUFS);
        }
 
-       if (bwn_tx_start(sc, ni, m) != 0) {
-               if (ni != NULL)
-                       ieee80211_free_node(ni);
-       }
-       sc->sc_watchdog_timer = 5;
+       error = bwn_tx_start(sc, ni, m);
+       if (error == 0)
+               sc->sc_watchdog_timer = 5;
        BWN_UNLOCK(sc);
-       return (0);
+       return (error);
 }
 
 /*

diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c
index cd2ccd2814f3ac4564f01c5874b5c827442a146e..df17f9312af34cbca8552918e9b1bb849fe90d54 100644 (file)
--- a/sys/dev/iwm/if_iwm.c
+++ b/sys/dev/iwm/if_iwm.c
@@ -2877,7 +2877,6 @@ iwm_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
            "->%s begin\n", __func__);
 
        if ((sc->sc_flags & IWM_FLAG_HW_INITED) == 0) {
-               ieee80211_free_node(ni);
                m_freem(m);
                IWM_DPRINTF(sc, IWM_DEBUG_XMIT,
                    "<-%s not RUNNING\n", __func__);
@@ -2891,10 +2890,6 @@ iwm_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        } else {
                error = iwm_tx(sc, m, ni, 0);
        }
-       if (error != 0) {
-               /* NB: m is reclaimed on tx failure */
-               ieee80211_free_node(ni);
-       }
        sc->sc_tx_timer = 5;
        IWM_UNLOCK(sc);
 

diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
index fe36294bbeba28dd3cff5f1332e8f43dfac194c6..0cdeafb5f8985a7d3f51109a3bdbd6e0facfb982 100644 (file)
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -4875,7 +4875,6 @@ iwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        DPRINTF(sc, IWN_DEBUG_XMIT | IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
        if ((sc->sc_flags & IWN_FLAG_RUNNING) == 0) {
-               ieee80211_free_node(ni);
                m_freem(m);
                return ENETDOWN;
        }
@@ -4889,9 +4888,6 @@ iwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if (sc->sc_beacon_wait) {
                if (iwn_xmit_queue_enqueue(sc, m) != 0) {
                        m_freem(m);
-                       if_inc_counter(ni->ni_vap->iv_ifp,
-                           IFCOUNTER_OERRORS, 1);
-                       ieee80211_free_node(ni);
                        IWN_UNLOCK(sc);
                        return (ENOBUFS);
                }
@@ -4913,10 +4909,7 @@ iwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
                 */
                error = iwn_tx_data_raw(sc, m, ni, params);
        }
-       if (error != 0) {
-               /* NB: m is reclaimed on tx failure */
-               ieee80211_free_node(ni);
-       } else
+       if (error == 0)
                sc->sc_tx_timer = 5;
 
        IWN_UNLOCK(sc);

diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c
index 251ddc60d3273507f96bcc5a35b88ea48646ce71..d02b6d5e24758f2cf42bbc23cbd2613086def06c 100644 (file)
--- a/sys/dev/malo/if_malo.c
+++ b/sys/dev/malo/if_malo.c
@@ -1786,7 +1786,6 @@ malo_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        struct malo_txq *txq;
 
        if (!sc->malo_running || sc->malo_invalid) {
-               ieee80211_free_node(ni);
                m_freem(m);
                return ENETDOWN;
        }
@@ -1800,7 +1799,6 @@ malo_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        txq = &sc->malo_txq[0];
        bf = malo_getbuf(sc, txq);
        if (bf == NULL) {
-               ieee80211_free_node(ni);
                m_freem(m);
                return ENOBUFS;
        }
@@ -1816,7 +1814,6 @@ malo_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
                txq->nfree++;
                MALO_TXQ_UNLOCK(txq);
 
-               ieee80211_free_node(ni);
                return EIO;             /* XXX */
        }
 

diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c
index 7f9d8e010e984da5d9d036eaef859d4018670d51..d01165c535b8afe7b6b600abd7ddcf1ceaced38e 100644 (file)
--- a/sys/dev/mwl/if_mwl.c
+++ b/sys/dev/mwl/if_mwl.c
@@ -1422,7 +1422,6 @@ mwl_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        struct mwl_txq *txq;
 
        if (!sc->sc_running || sc->sc_invalid) {
-               ieee80211_free_node(ni);
                m_freem(m);
                return ENETDOWN;
        }
@@ -1438,7 +1437,6 @@ mwl_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        bf = mwl_gettxbuf(sc, txq);
        if (bf == NULL) {
                sc->sc_stats.mst_tx_qstop++;
-               ieee80211_free_node(ni);
                m_freem(m);
                return ENOBUFS;
        }
@@ -1448,7 +1446,6 @@ mwl_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if (mwl_tx_start(sc, ni, bf, m)) {
                mwl_puttxbuf_head(txq, bf);
 
-               ieee80211_free_node(ni);
                return EIO;             /* XXX */
        }
        /*

diff --git a/sys/dev/otus/if_otus.c b/sys/dev/otus/if_otus.c
index e60157adda9d7c1f2917e85c33835ec37f618acc..2f6d92fa307e0136b01936ac9600a6939d267962 100644 (file)
--- a/sys/dev/otus/if_otus.c
+++ b/sys/dev/otus/if_otus.c
@@ -567,7 +567,6 @@ error:
        if (bf)
                otus_freebuf(sc, bf);
        OTUS_UNLOCK(sc);
-       ieee80211_free_node(ni);
        m_freem(m);
        return (ENXIO);
 }

diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c
index b03e8faaf242c11cefb5af09e4e23da2b6d94744..e5d75181e460ccecdb527e99ab0a93bf19fe0762 100644 (file)
--- a/sys/dev/ral/rt2560.c
+++ b/sys/dev/ral/rt2560.c
@@ -2711,13 +2711,11 @@ rt2560_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if (!(sc->sc_flags & RT2560_F_RUNNING)) {
                RAL_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return ENETDOWN;
        }
        if (sc->prioq.queued >= RT2560_PRIO_RING_COUNT) {
                RAL_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return ENOBUFS;         /* XXX */
        }
 
@@ -2742,7 +2740,6 @@ rt2560_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 
        return 0;
 bad:
-       ieee80211_free_node(ni);
        RAL_UNLOCK(sc);
        return EIO;             /* XXX */
 }

diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
index 100b5d613424f36e41629e6d0573c7a4bb2f888a..cff64b18dd172634316341de488363a3ed07496f 100644 (file)
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -1636,13 +1636,11 @@ rt2661_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if (!(sc->sc_flags & RAL_RUNNING)) {
                RAL_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return ENETDOWN;
        }
        if (sc->mgtq.queued >= RT2661_MGT_RING_COUNT) {
                RAL_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return ENOBUFS;         /* XXX */
        }
 
@@ -1659,7 +1657,6 @@ rt2661_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 
        return 0;
 bad:
-       ieee80211_free_node(ni);
        RAL_UNLOCK(sc);
        return EIO;             /* XXX */
 }

diff --git a/sys/dev/ral/rt2860.c b/sys/dev/ral/rt2860.c
index 9c7fa532957d85be079d1ca6f1ced09f562eb1d5..d233315d28e75d08879b10a934155d5b40f3af9a 100644 (file)
--- a/sys/dev/ral/rt2860.c
+++ b/sys/dev/ral/rt2860.c
@@ -1702,7 +1702,6 @@ rt2860_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if (!(sc->sc_flags & RT2860_RUNNNING)) {
                RAL_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return ENETDOWN;
        }
        if (params == NULL) {
@@ -1718,10 +1717,6 @@ rt2860_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
                 */
                error = rt2860_tx_raw(sc, m, ni, params);
        }
-       if (error != 0) {
-               /* NB: m is reclaimed on tx failure */
-               ieee80211_free_node(ni);
-       }
        sc->sc_tx_timer = 5;
        RAL_UNLOCK(sc);
        return error;

diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c
index 4fb9d85bee9dd72082d21708ef3add5905280f3b..6558c93571ea4dad7920e52189a39c4e883cff87 100644 (file)
--- a/sys/dev/usb/wlan/if_rsu.c
+++ b/sys/dev/usb/wlan/if_rsu.c
@@ -2793,19 +2793,16 @@ rsu_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        /* prevent management frames from being sent if we're not ready */
        if (!sc->sc_running) {
                m_freem(m);
-               ieee80211_free_node(ni);
                return (ENETDOWN);
        }
        RSU_LOCK(sc);
        bf = rsu_getbuf(sc);
        if (bf == NULL) {
-               ieee80211_free_node(ni);
                m_freem(m);
                RSU_UNLOCK(sc);
                return (ENOBUFS);
        }
        if (rsu_tx_start(sc, ni, m, bf) != 0) {
-               ieee80211_free_node(ni);
                m_freem(m);
                rsu_freebuf(sc, bf);
                RSU_UNLOCK(sc);

diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index f1c9cdf66524c33f7b50cc83d367e5e3ac7468f1..de7b8806e80099709f5eeb31cc8ef29cd05b5371 100644 (file)
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -2850,7 +2850,6 @@ rum_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 bad:
        RUM_UNLOCK(sc);
        m_freem(m);
-       ieee80211_free_node(ni);
        return ret;
 }
 

diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c
index be43755588e348e8c5fcea77da09b0b976177678..3a8c02038bfb63efc0d596db4563c1e2af617ba0 100644 (file)
--- a/sys/dev/usb/wlan/if_run.c
+++ b/sys/dev/usb/wlan/if_run.c
@@ -3707,7 +3707,6 @@ done:
        if (error != 0) {
                if(m != NULL)
                        m_freem(m);
-               ieee80211_free_node(ni);
        }
 
        return (error);

diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index 292bb9f6626ed6b2cb41053ca4099eaac210030a..ec5b54caf46c00a42fa69e9cce09a51dd8acaee8 100644 (file)
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -1781,7 +1781,6 @@ uath_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if ((sc->sc_flags & UATH_FLAG_INVALID) ||
            !(sc->sc_flags & UATH_FLAG_INITDONE)) {
                m_freem(m);
-               ieee80211_free_node(ni);
                UATH_UNLOCK(sc);
                return (ENETDOWN);
        }
@@ -1789,7 +1788,6 @@ uath_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        /* grab a TX buffer  */
        bf = uath_getbuf(sc);
        if (bf == NULL) {
-               ieee80211_free_node(ni);
                m_freem(m);
                UATH_UNLOCK(sc);
                return (ENOBUFS);
@@ -1797,7 +1795,6 @@ uath_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 
        sc->sc_seqnum = 0;
        if (uath_tx_start(sc, m, ni, bf) != 0) {
-               ieee80211_free_node(ni);
                STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
                UATH_STAT_INC(sc, st_tx_inactive);
                UATH_UNLOCK(sc);

diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c
index 516caf0c43e03b6e331fcb123488ea373f36dea7..2689ae0fb7f3816dac24c00f84342270a7948049 100644 (file)
--- a/sys/dev/usb/wlan/if_upgt.c
+++ b/sys/dev/usb/wlan/if_upgt.c
@@ -798,14 +798,12 @@ upgt_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        /* prevent management frames from being sent if we're not ready */
        if (!(sc->sc_flags & UPGT_FLAG_INITDONE)) {
                m_freem(m);
-               ieee80211_free_node(ni);
                UPGT_UNLOCK(sc);
                return ENETDOWN;
        }
 
        data_tx = upgt_gettxbuf(sc);
        if (data_tx == NULL) {
-               ieee80211_free_node(ni);
                m_freem(m);
                UPGT_UNLOCK(sc);
                return (ENOBUFS);
@@ -814,7 +812,6 @@ upgt_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if (upgt_tx_start(sc, m, ni, data_tx) != 0) {
                STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, data_tx, next);
                UPGT_STAT_INC(sc, st_tx_inactive);
-               ieee80211_free_node(ni);
                UPGT_UNLOCK(sc);
                return (EIO);
        }

diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c
index 6f6686f21c8c7b06fd2048f3f7506c264ce8767d..3fb03bdf39d1edda750df22e68c488ab26d63921 100644 (file)
--- a/sys/dev/usb/wlan/if_ural.c
+++ b/sys/dev/usb/wlan/if_ural.c
@@ -2123,13 +2123,11 @@ ural_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if (!sc->sc_running) {
                RAL_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return ENETDOWN;
        }
        if (sc->tx_nfree < RAL_TX_MINFREE) {
                RAL_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return EIO;
        }
 
@@ -2152,7 +2150,6 @@ ural_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        return 0;
 bad:
        RAL_UNLOCK(sc);
-       ieee80211_free_node(ni);
        return EIO;             /* XXX */
 }
 

diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c
index 040ba867df305f7fc24e37585014f2747ab7e5d5..a9aac3a02f20ce5d7614ecf3840d94df51d5342b 100644 (file)
--- a/sys/dev/usb/wlan/if_urtw.c
+++ b/sys/dev/usb/wlan/if_urtw.c
@@ -1527,20 +1527,17 @@ urtw_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        /* prevent management frames from being sent if we're not ready */
        if (!(sc->sc_flags & URTW_RUNNING)) {
                m_freem(m);
-               ieee80211_free_node(ni);
                return ENETDOWN;
        }
        URTW_LOCK(sc);
        bf = urtw_getbuf(sc);
        if (bf == NULL) {
-               ieee80211_free_node(ni);
                m_freem(m);
                URTW_UNLOCK(sc);
                return (ENOBUFS);               /* XXX */
        }
 
        if (urtw_tx_start(sc, ni, m, bf, URTW_PRIORITY_LOW) != 0) {
-               ieee80211_free_node(ni);
                STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
                URTW_UNLOCK(sc);
                return (EIO);

diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c
index f680edc33cb9c907df6ceb262bfcebbf5b3a18ad..cb101c65ea4212777308a595916bc3f0b7739c10 100644 (file)
--- a/sys/dev/usb/wlan/if_urtwn.c
+++ b/sys/dev/usb/wlan/if_urtwn.c
@@ -3460,13 +3460,11 @@ urtwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        /* prevent management frames from being sent if we're not ready */
        if (!(sc->sc_flags & URTWN_RUNNING)) {
                m_freem(m);
-               ieee80211_free_node(ni);
                return (ENETDOWN);
        }
        URTWN_LOCK(sc);
        bf = urtwn_getbuf(sc);
        if (bf == NULL) {
-               ieee80211_free_node(ni);
                m_freem(m);
                URTWN_UNLOCK(sc);
                return (ENOBUFS);
@@ -3474,7 +3472,6 @@ urtwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 
        if (urtwn_tx_start(sc, ni, m, bf) != 0) {
                m_freem(m);
-               ieee80211_free_node(ni);
                STAILQ_INSERT_HEAD(&sc->sc_tx_inactive, bf, next);
                URTWN_UNLOCK(sc);
                return (EIO);

diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index ed70d19a43e2ad49fc63b227f24c3db3e87639f0..dc7a87f2dad6c0dafa0d4c58814bb93370f232d2 100644 (file)
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -2590,13 +2590,11 @@ zyd_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
        if (!(sc->sc_flags & ZYD_FLAG_RUNNING)) {
                ZYD_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return (ENETDOWN);
        }
        if (sc->tx_nfree == 0) {
                ZYD_UNLOCK(sc);
                m_freem(m);
-               ieee80211_free_node(ni);
                return (ENOBUFS);               /* XXX */
        }
 
@@ -2607,7 +2605,6 @@ zyd_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
         */
        if (zyd_tx_start(sc, m, ni) != 0) {
                ZYD_UNLOCK(sc);
-               ieee80211_free_node(ni);
                m_freem(m);
                return (EIO);
        }

diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index f8af23138340f3e254519892e8abbe67bfdf0c04..832e6aa37c04fbb61157d4e70667c7cf2d82bbb8 100644 (file)
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -1077,6 +1077,7 @@ wi_raw_xmit(struct ieee80211_node *ni, struct mbuf *m0,
                goto out;
        }
        m0 = NULL;
+       ieee80211_free_node(ni);
 
        sc->sc_txnext = cur = (cur + 1) % sc->sc_ntxbuf;
 out:
@@ -1084,7 +1085,6 @@ out:
 
        if (m0 != NULL)
                m_freem(m0);
-       ieee80211_free_node(ni);
        return rc;
 }
 

diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index 040360f16cda6e26be2efa61dbf77ce38dfe8d58..7932bce9b7dec45d6795746400422baa758ae492 100644 (file)
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -3093,7 +3093,6 @@ unlock:   WPI_TX_UNLOCK(sc);
 
        if (error != 0) {
                m_freem(m);
-               ieee80211_free_node(ni);
                DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END_ERR, __func__);
 
                return error;

diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 81d9eb192e363b0fe0e2c4a53031f0dd4dcfe671..322491d25a2cc56ac5c04041a1ecb65aac3dbef5 100644 (file)
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -531,8 +531,10 @@ ieee80211_raw_output(struct ieee80211vap *vap, struct ieee80211_node *ni,
                (void) ieee80211_add_xmit_params(m, params);
 
        error = ic->ic_raw_xmit(ni, m, params);
-       if (error)
+       if (error) {
                if_inc_counter(vap->iv_ifp, IFCOUNTER_OERRORS, 1);
+               ieee80211_free_node(ni);
+       }
        return (error);
 }