From owner-svn-src-all@FreeBSD.ORG  Thu Feb  7 21:29:15 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1DE5D819;
 Thu,  7 Feb 2013 21:29:15 +0000 (UTC)
 (envelope-from monthadar@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 041E6F7C;
 Thu,  7 Feb 2013 21:29:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r17LTEjD012251;
 Thu, 7 Feb 2013 21:29:14 GMT
 (envelope-from monthadar@svn.freebsd.org)
Received: (from monthadar@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r17LTEBk012250;
 Thu, 7 Feb 2013 21:29:14 GMT
 (envelope-from monthadar@svn.freebsd.org)
Message-Id: <201302072129.r17LTEBk012250@svn.freebsd.org>
From: Monthadar Al Jaberi <monthadar@FreeBSD.org>
Date: Thu, 7 Feb 2013 21:29:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246515 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Feb 2013 21:29:15 -0000

Author: monthadar
Date: Thu Feb  7 21:29:14 2013
New Revision: 246515
URL: http://svnweb.freebsd.org/changeset/base/246515

Log:
  Mesh HWMP PREQ: fixed conditions for discarding elements.
  
  Approved by:	adrian (mentor)

Modified:
  head/sys/net80211/ieee80211_hwmp.c

Modified: head/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- head/sys/net80211/ieee80211_hwmp.c	Thu Feb  7 21:28:25 2013	(r246514)
+++ head/sys/net80211/ieee80211_hwmp.c	Thu Feb  7 21:29:14 2013	(r246515)
@@ -997,10 +997,10 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 		 * it will be marked below.
 		 */
 		rtorig->rt_flags = IEEE80211_MESHRT_FLAGS_VALID;
-	}else if ((hrtarg != NULL &&
-	    HWMP_SEQ_EQ(hrtarg->hr_seq, PREQ_TSEQ(0)) &&
-	    ((rtorig->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) == 0)) ||
-	    preqid >= preq->preq_id) {
+	} else if ((hrtarg != NULL &&
+	    !HWMP_SEQ_EQ(hrtarg->hr_seq, PREQ_TSEQ(0))) ||
+	    (rtorig->rt_flags & IEEE80211_MESHRT_FLAGS_VALID &&
+	    preqid >= preq->preq_id)) {
 		IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni,
 		    "discard PREQ from %6D, old seqno %u <= %u,"
 		    " or old preqid %u < %u",