From owner-svn-src-projects@FreeBSD.ORG  Wed Jul  1 01:31:14 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 C357E106564A;
	Wed,  1 Jul 2009 01:31:14 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B28B18FC0C;
	Wed,  1 Jul 2009 01:31:14 +0000 (UTC) (envelope-from sam@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 n611VENV097725;
	Wed, 1 Jul 2009 01:31:14 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n611VEu2097722;
	Wed, 1 Jul 2009 01:31:14 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200907010131.n611VEu2097722@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Wed, 1 Jul 2009 01:31:14 +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: r195224 - 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: Wed, 01 Jul 2009 01:31:15 -0000

Author: sam
Date: Wed Jul  1 01:31:14 2009
New Revision: 195224
URL: http://svn.freebsd.org/changeset/base/195224

Log:
  move debug msg for drop due to mesh seq# and make it consistent

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	Wed Jul  1 01:29:06 2009	(r195223)
+++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c	Wed Jul  1 01:31:14 2009	(r195224)
@@ -1175,9 +1175,6 @@ ieee80211_hwmp_checkpseq(struct ieee8021
 		return 0;
 	}
 	if (IEEE80211_MESH_SEQ_GEQ(rt->rt_lastpseq, seq)) {
-		IEEE80211_NOTE(vap, IEEE80211_MSG_MESH,
-		    vap->iv_bss, "seqno %u <= seqno %u", seq,
-		    rt->rt_lastpseq);
 		return 1;
 	} else {
 		rt->rt_lastpseq = seq;

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jul  1 01:29:06 2009	(r195223)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jul  1 01:31:14 2009	(r195224)
@@ -545,8 +545,13 @@ mesh_input(struct ieee80211_node *ni, st
 			addr = ((struct ieee80211_qosframe_addr4 *)wh)->i_addr4;
 		if (IEEE80211_ADDR_EQ(vap->iv_myaddr, addr))
 			goto out;
-		if (ieee80211_hwmp_checkpseq(vap, addr, seq))
+		if (ieee80211_hwmp_checkpseq(vap, addr, seq) != 0) {
+			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH,
+			    addr, "data", "duplicate mesh seqno %u ttl %u",
+			    seq, mc->mc_ttl);
+			vap->iv_stats.is_rx_dup++;
 			goto out;
+		}
 		/*
 		 * Forward and deliver multicast packets
 		 */