summaryrefslogtreecommitdiffstats
path: root/sys/net80211
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2013-03-09 05:20:33 +0000
committeradrian <adrian@FreeBSD.org>2013-03-09 05:20:33 +0000
commit11f27b0f39118fe7177aebcac2df4be9f9f50b32 (patch)
tree1a307727f4617e10299d012c8d34effe9f8c6ffa /sys/net80211
parent72f7f3e528d2e900546a7ccbe16525b12d64dd44 (diff)
downloadFreeBSD-src-11f27b0f39118fe7177aebcac2df4be9f9f50b32.zip
FreeBSD-src-11f27b0f39118fe7177aebcac2df4be9f9f50b32.tar.gz
Fix non-invariant compilation.
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_mesh.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c
index 7f1ba21..276de1e 100644
--- a/sys/net80211/ieee80211_mesh.c
+++ b/sys/net80211/ieee80211_mesh.c
@@ -1477,10 +1477,9 @@ mesh_recv_indiv_data_to_fwrd(struct ieee80211vap *vap, struct mbuf *m,
struct ieee80211_qosframe_addr4 *qwh;
struct ieee80211_mesh_state *ms = vap->iv_mesh;
struct ieee80211_mesh_route *rt_meshda, *rt_meshsa;
- struct ieee80211com *ic = vap->iv_ic;
/* This is called from the RX path - don't hold this lock */
- IEEE80211_TX_UNLOCK_ASSERT(ic);
+ IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);
qwh = (struct ieee80211_qosframe_addr4 *)wh;
@@ -1536,11 +1535,10 @@ mesh_recv_indiv_data_to_me(struct ieee80211vap *vap, struct mbuf *m,
const struct ieee80211_meshcntl_ae10 *mc10;
struct ieee80211_mesh_state *ms = vap->iv_mesh;
struct ieee80211_mesh_route *rt;
- struct ieee80211com *ic = vap->iv_ic;
int ae;
/* This is called from the RX path - don't hold this lock */
- IEEE80211_TX_UNLOCK_ASSERT(ic);
+ IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);
qwh = (struct ieee80211_qosframe_addr4 *)wh;
mc10 = (const struct ieee80211_meshcntl_ae10 *)mc;
@@ -1603,10 +1601,9 @@ mesh_recv_group_data(struct ieee80211vap *vap, struct mbuf *m,
{
#define MC01(mc) ((const struct ieee80211_meshcntl_ae01 *)mc)
struct ieee80211_mesh_state *ms = vap->iv_mesh;
- struct ieee80211com *ic = vap->iv_ic;
/* This is called from the RX path - don't hold this lock */
- IEEE80211_TX_UNLOCK_ASSERT(ic);
+ IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);
mesh_forward(vap, m, mc);
OpenPOWER on IntegriCloud