From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 20 20:36:52 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A8691065678;
	Sat, 20 Jun 2009 20:36:52 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 293F88FC21;
	Sat, 20 Jun 2009 20:36:52 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5KKaq1K086299;
	Sat, 20 Jun 2009 20:36:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5KKaq0j086297;
	Sat, 20 Jun 2009 20:36:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906202036.n5KKaq0j086297@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 20 Jun 2009 20:36:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194559 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jun 2009 20:36:52 -0000

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 */