diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2015-10-12 04:55:20 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2015-10-12 04:55:20 +0000 |
| commit | d957a93abe82adf570931b97a918d9555a655a1e (patch) | |
| tree | 0ad5a3585c48c4d2f6705ea7eb28cc7313a8c059 /sys/dev/malo/if_malo.c | |
| parent | d3a4ade3b8232efc2338e59219d1cf108f6ee930 (diff) | |
| download | src-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/malo/if_malo.c')
| -rw-r--r-- | sys/dev/malo/if_malo.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c index 251ddc60d327..d02b6d5e2475 100644 --- 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 */ } |