svn commit: r195178 - projects/mesh11s/sys/net80211

[Rui Paulo]

Author: rpaulo
Date: Mon Jun 29 21:03:54 2009
New Revision: 195178
URL: http://svn.freebsd.org/changeset/base/195178

Log:
  * fix prep processing
  * rename nidest to just ni
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_hwmp.c
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Mon Jun 29 20:19:19 2009	(r195177)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Mon Jun 29 21:03:54 2009	(r195178)
@@ -799,10 +799,6 @@ hwmp_recv_prep(struct ieee80211vap *vap,
 		pprep.prep_metric += ieee80211_airtime_calc(ni);
 		IEEE80211_ADDR_COPY(pprep.prep_origaddr, vap->iv_myaddr);
 		hwmp_send_prep(ni, vap->iv_myaddr, broadcastaddr, &pprep);
-		/*
-		 * XXX: update the precursor list.
-		 */
-		return;
 	}
 
 	rt = hwmp_rt_find(vap, prep->prep_origaddr);

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun 29 20:19:19 2009	(r195177)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun 29 21:03:54 2009	(r195178)
@@ -332,7 +332,7 @@ mesh_forward(struct ieee80211vap *vap, s
 	struct ieee80211_frame *whcopy;
 	const struct ieee80211_txparam *tp;
 	struct ieee80211_bpf_params params;
-	struct ieee80211_node *nidest;
+	struct ieee80211_node *ni;
 	int err;
 
 	mcopy = m_dup(m, M_DONTWAIT);
@@ -357,25 +357,25 @@ mesh_forward(struct ieee80211vap *vap, s
 	whcopy->i_fc[1] &= ~IEEE80211_FC1_RETRY;
 	IEEE80211_ADDR_COPY(whcopy->i_addr2, vap->iv_myaddr);
 	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-		nidest = vap->iv_bss;
-		tp = nidest->ni_txparms;
+		ni = vap->iv_bss;
+		tp = ni->ni_txparms;
 		params.ibp_rate0 = tp->mcastrate;
 		params.ibp_flags |= IEEE80211_BPF_NOACK;
 		params.ibp_try0 = 1;
 		mcopy->m_flags |= M_MCAST;
 	} else {
-		nidest = ieee80211_hwmp_find_txnode(vap, whcopy->i_addr3);
-		if (nidest == NULL) {
+		ni = ieee80211_hwmp_find_txnode(vap, whcopy->i_addr3);
+		if (ni == NULL) {
 			/* XXX stat+msg? */
 			m_freem(mcopy);
 			return;
 		}
-		tp = nidest->ni_txparms;
+		tp = ni->ni_txparms;
 		params.ibp_rate0 = tp->ucastrate;
 		params.ibp_try0 = tp->maxretry;
-		IEEE80211_ADDR_COPY(whcopy->i_addr1, nidest->ni_macaddr);
+		IEEE80211_ADDR_COPY(whcopy->i_addr1, ni->ni_macaddr);
 	}
-	IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, nidest,
+	IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni,
 	    "fwd %s frame from %s ttl %d",
 	    IEEE80211_IS_MULTICAST(wh->i_addr1) ?  "mcast" : "ucast",
 	    ether_sprintf(wh->i_addr3), mccopy->mc_ttl);
@@ -384,20 +384,20 @@ mesh_forward(struct ieee80211vap *vap, s
 	/* XXX calculate priority so drivers can find the tx queue */
 	M_WME_SETAC(mcopy, WME_AC_BE);
 	params.ibp_pri = M_WME_GETAC(mcopy);
-	params.ibp_power = nidest->ni_txpower;
+	params.ibp_power = ni->ni_txpower;
 #ifdef IEEE80211_DEBUG_REFCNT
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
 	    "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n",
 	    __func__, __LINE__,
-	    nidest, ether_sprintf(nidest->ni_macaddr),
-	    ieee80211_node_refcnt(nidest)+1);
+	    ni, ether_sprintf(ni->ni_macaddr),
+	    ieee80211_node_refcnt(ni)+1);
 #endif
-	ieee80211_ref_node(nidest);
-	err = ic->ic_raw_xmit(nidest, mcopy, &params);
+	ieee80211_ref_node(ni);
+	err = ic->ic_raw_xmit(ni, mcopy, &params);
 	if (err) {
 		/* NB: IFQ_HANDOFF reclaims mbuf */
 		ifp->if_oerrors++;
-		ieee80211_free_node(nidest);
+		ieee80211_free_node(ni);
 	} else
 		ifp->if_opackets++;
 }