summaryrefslogtreecommitdiffstats
path: root/sys/net80211
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2015-10-12 04:55:20 +0000
committeradrian <adrian@FreeBSD.org>2015-10-12 04:55:20 +0000
commitddc10d6668d00854cf056f91c44cf92010f26e7c (patch)
tree0ad5a3585c48c4d2f6705ea7eb28cc7313a8c059 /sys/net80211
parent5a44e8c44b09f08ee9e42d177f79640c96f4c857 (diff)
downloadFreeBSD-src-ddc10d6668d00854cf056f91c44cf92010f26e7c.zip
FreeBSD-src-ddc10d6668d00854cf056f91c44cf92010f26e7c.tar.gz
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
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_output.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 81d9eb1..322491d 100644
--- 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);
}
OpenPOWER on IntegriCloud