Author: adrian
Date: Sat Mar 9 05:20:33 2013
New Revision: 248089
URL: http://svnweb.freebsd.org/changeset/base/248089
Log:
Fix non-invariant compilation.
Modified:
head/sys/net80211/ieee80211_mesh.c
Modified: head/sys/net80211/ieee80211_mesh.c
==============================================================================
--- head/sys/net80211/ieee80211_mesh.c Sat Mar 9 03:19:53 2013
(r248088)
+++ head/sys/net80211/ieee80211_mesh.c Sat Mar 9 05:20:33 2013
(r248089)
@@ -1477,10 +1477,9 @@ mesh_recv_indiv_data_to_fwrd(struct ieee
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 ieee80
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
{
#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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
