Date: Sat, 9 Mar 2013 14:34:54 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r248103 - user/attilio/vmc-playground/sys/net80211 Message-ID: <201303091434.r29EYsFf087612@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sat Mar 9 14:34:53 2013 New Revision: 248103 URL: http://svnweb.freebsd.org/changeset/base/248103 Log: Fix mismerge. Modified: user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c Modified: user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c ============================================================================== --- user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c Sat Mar 9 13:30:06 2013 (r248102) +++ user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c Sat Mar 9 14:34:53 2013 (r248103) @@ -1477,7 +1477,6 @@ 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(vap->iv_ic); @@ -1536,7 +1535,6 @@ 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 */ @@ -1603,7 +1601,6 @@ 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(vap->iv_ic);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303091434.r29EYsFf087612>