aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/usb/wlan/if_urtwn.c
diff options
context:
space:
mode:
authorAdrian Chadd <adrian@FreeBSD.org>2015-10-12 04:55:20 +0000
committerAdrian Chadd <adrian@FreeBSD.org>2015-10-12 04:55:20 +0000
commitd957a93abe82adf570931b97a918d9555a655a1e (patch)
tree0ad5a3585c48c4d2f6705ea7eb28cc7313a8c059 /sys/dev/usb/wlan/if_urtwn.c
parentd3a4ade3b8232efc2338e59219d1cf108f6ee930 (diff)
downloadsrc-d957a93abe82adf570931b97a918d9555a655a1e.tar.gz
src-d957a93abe82adf570931b97a918d9555a655a1e.zip
net80211: move ieee80211_free_node() call on error from ic_raw_xmit() to ieee80211_raw_output().
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
Notes
Notes: svn path=/head/; revision=289165
Diffstat (limited to 'sys/dev/usb/wlan/if_urtwn.c')
-rw-r--r--sys/dev/usb/wlan/if_urtwn.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c
index f680edc33cb9..cb101c65ea42 100644
--- 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);