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

[Rui Paulo]

Author: rpaulo
Date: Sat Jun 20 20:36:51 2009
New Revision: 194559
URL: http://svn.freebsd.org/changeset/base/194559

Log:
  Revert previous. What sam was saying was that we should clear the retry
  bit before retransmit.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sat Jun 20 20:35:50 2009	(r194558)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sat Jun 20 20:36:51 2009	(r194559)
@@ -394,7 +394,6 @@ mesh_input(struct ieee80211_node *ni, st
 		 */
 		if (IEEE80211_IS_MULTICAST(wh->i_addr1) && mc->mc_ttl > 0 &&
 		    !IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr3) &&
-		    !(wh->i_fc[1] & IEEE80211_FC1_RETRY) &&
 		    (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD)) {
 			struct mbuf *mcopy;
 			struct ieee80211_meshcntl *mccopy;
@@ -423,6 +422,8 @@ mesh_input(struct ieee80211_node *ni, st
 			mccopy = (struct ieee80211_meshcntl *)
 			    (mtod(mcopy, uint8_t *) +
 				ieee80211_hdrspace(ic, wh));
+			/* XXX clear other bits? */
+			whcopy->i_fc[1] &= ~IEEE80211_FC1_RETRY;
 			IEEE80211_ADDR_COPY(whcopy->i_addr2, vap->iv_myaddr);
 			mccopy->mc_ttl--;
 			/* XXX calculate priority so drivers can find the tx queue */