Page MenuHomeFreeBSD
Files F142815502

D42427.diff
No OneTemporary
Actions

D42427.diff
View Options

diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -4154,7 +4154,6 @@
struct ieee80211_sta *sta, struct napi_struct *napi __unused,
struct list_head *list __unused)
{
- struct epoch_tracker et;
struct lkpi_hw *lhw;
struct ieee80211com *ic;
struct mbuf *m;
@@ -4371,7 +4370,6 @@
}
#endif
- NET_EPOCH_ENTER(et);
if (ni != NULL) {
ok = ieee80211_input_mimo(ni, m);
ieee80211_free_node(ni);
@@ -4381,7 +4379,6 @@
ok = ieee80211_input_mimo_all(ic, m);
/* mbuf got consumed. */
}
- NET_EPOCH_EXIT(et);
#ifdef LINUXKPI_DEBUG_80211
if (linuxkpi_debug_80211 & D80211_TRACE_RX)
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -419,6 +419,8 @@
(void) ieee80211_vap_xmitpkt(vap, mcopy);
}
if (m != NULL) {
+ struct epoch_tracker et;
+
/*
* Mark frame as coming from vap's interface.
*/
@@ -435,7 +437,9 @@
m->m_pkthdr.ether_vtag = ni->ni_vlan;
m->m_flags |= M_VLANTAG;
}
+ NET_EPOCH_ENTER(et);
ifp->if_input(ifp, m);
+ NET_EPOCH_EXIT(et);
}
}
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -274,6 +274,7 @@
ieee80211_deliver_data(struct ieee80211vap *vap,
struct ieee80211_node *ni, struct mbuf *m)
{
+ struct epoch_tracker et;
struct ether_header *eh = mtod(m, struct ether_header *);
struct ifnet *ifp = vap->iv_ifp;
@@ -304,7 +305,9 @@
m->m_pkthdr.ether_vtag = ni->ni_vlan;
m->m_flags |= M_VLANTAG;
}
+ NET_EPOCH_ENTER(et);
ifp->if_input(ifp, m);
+ NET_EPOCH_EXIT(et);
}
struct mbuf *

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 24, 9:12 PM (13 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27910490
Default Alt Text
D42427.diff (1 KB)

Event Timeline