Page MenuHomeFreeBSD
Files F145949887

D3772.diff
No OneTemporary
Actions

D3772.diff
View Options

Index: head/sys/dev/iwn/if_iwn.c
===================================================================
--- head/sys/dev/iwn/if_iwn.c
+++ head/sys/dev/iwn/if_iwn.c
@@ -4950,9 +4950,7 @@
}
error = iwn_tx_data(sc, m, ni);
- if (error) {
- if_inc_counter(ni->ni_vap->iv_ifp, IFCOUNTER_OERRORS, 1);
- } else
+ if (!error)
sc->sc_tx_timer = 5;
IWN_UNLOCK(sc);
return (error);
Index: head/sys/net80211/ieee80211_freebsd.c
===================================================================
--- head/sys/net80211/ieee80211_freebsd.c
+++ head/sys/net80211/ieee80211_freebsd.c
@@ -529,9 +529,6 @@
/*
* Transmit a frame to the parent interface.
- *
- * TODO: if the transmission fails, make sure the parent node is freed
- * (the callers will first need modifying.)
*/
int
ieee80211_parent_xmitpkt(struct ieee80211com *ic, struct mbuf *m)
@@ -544,8 +541,16 @@
*/
IEEE80211_TX_LOCK_ASSERT(ic);
error = ic->ic_transmit(ic, m);
- if (error)
+ if (error) {
+ struct ieee80211_node *ni;
+
+ ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
+
+ /* XXX number of fragments */
+ if_inc_counter(ni->ni_vap->iv_ifp, IFCOUNTER_OERRORS, 1);
+ ieee80211_free_node(ni);
ieee80211_free_mbuf(m);
+ }
return (error);
}
Index: head/sys/net80211/ieee80211_hostap.c
===================================================================
--- head/sys/net80211/ieee80211_hostap.c
+++ head/sys/net80211/ieee80211_hostap.c
@@ -2327,12 +2327,11 @@
/*
* Do the right thing; if it's an encap'ed frame then
- * call ieee80211_parent_xmitpkt() (and free the ref) else
+ * call ieee80211_parent_xmitpkt() else
* call ieee80211_vap_xmitpkt().
*/
if (m->m_flags & M_ENCAP) {
- if (ieee80211_parent_xmitpkt(ic, m) != 0)
- ieee80211_free_node(ni);
+ (void) ieee80211_parent_xmitpkt(ic, m);
} else {
(void) ieee80211_vap_xmitpkt(vap, m);
}
Index: head/sys/net80211/ieee80211_mesh.c
===================================================================
--- head/sys/net80211/ieee80211_mesh.c
+++ head/sys/net80211/ieee80211_mesh.c
@@ -1239,12 +1239,8 @@
IEEE80211_TX_LOCK(ic);
err = ieee80211_parent_xmitpkt(ic, mcopy);
IEEE80211_TX_UNLOCK(ic);
- if (err != 0) {
- /* NB: IFQ_HANDOFF reclaims mbuf */
- ieee80211_free_node(ni);
- } else {
+ if (!err)
if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
- }
}
static struct mbuf *
Index: head/sys/net80211/ieee80211_output.c
===================================================================
--- head/sys/net80211/ieee80211_output.c
+++ head/sys/net80211/ieee80211_output.c
@@ -132,7 +132,7 @@
{
struct ieee80211com *ic = vap->iv_ic;
struct ifnet *ifp = vap->iv_ifp;
- int error, len, mcast;
+ int len, mcast;
if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT) &&
(m->m_flags & M_PWR_SAV) == 0) {
@@ -264,18 +264,13 @@
return (ENOBUFS);
}
}
- error = ieee80211_parent_xmitpkt(ic, m);
+ (void) ieee80211_parent_xmitpkt(ic, m);
/*
* Unlock at this point - no need to hold it across
* ieee80211_free_node() (ie, the comlock)
*/
IEEE80211_TX_UNLOCK(ic);
- if (error != 0) {
- /* NB: IFQ_HANDOFF reclaims mbuf */
- ieee80211_free_node(ni);
- if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
- }
ic->ic_lastdata = ticks;
return (0);
Index: head/sys/net80211/ieee80211_power.c
===================================================================
--- head/sys/net80211/ieee80211_power.c
+++ head/sys/net80211/ieee80211_power.c
@@ -457,12 +457,7 @@
KASSERT((m->m_flags & M_ENCAP),
("%s: parentq with non-M_ENCAP frame!\n",
__func__));
- /*
- * For encaped frames, we need to free the node
- * reference upon failure.
- */
- if (ieee80211_parent_xmitpkt(ic, m) != 0)
- ieee80211_free_node(ni);
+ (void) ieee80211_parent_xmitpkt(ic, m);
}
/* VAP frames, aren't encapsulated */
Index: head/sys/net80211/ieee80211_superg.c
===================================================================
--- head/sys/net80211/ieee80211_superg.c
+++ head/sys/net80211/ieee80211_superg.c
@@ -475,13 +475,9 @@
if (m != NULL) {
struct ifnet *ifp = vap->iv_ifp;
- error = ieee80211_parent_xmitpkt(ic, m);;
- if (error != 0) {
- /* NB: IFQ_HANDOFF reclaims mbuf */
- ieee80211_free_node(ni);
- } else {
+ error = ieee80211_parent_xmitpkt(ic, m);
+ if (!error)
if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
- }
} else
ieee80211_free_node(ni);
}
Index: head/sys/net80211/ieee80211_wds.c
===================================================================
--- head/sys/net80211/ieee80211_wds.c
+++ head/sys/net80211/ieee80211_wds.c
@@ -298,11 +298,7 @@
mcopy->m_pkthdr.rcvif = (void *) ni;
err = ieee80211_parent_xmitpkt(ic, mcopy);
- if (err) {
- /* NB: IFQ_HANDOFF reclaims mbuf */
- if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
- ieee80211_free_node(ni);
- } else {
+ if (!err) {
if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
if_inc_counter(ifp, IFCOUNTER_OBYTES,

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 27, 11:14 AM (10 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29027598
Default Alt Text
D3772.diff (4 KB)

Event Timeline