From owner-svn-src-head@FreeBSD.ORG  Thu Feb  7 21:28:26 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 78B3768F;
 Thu,  7 Feb 2013 21:28:26 +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 68EC5F6C;
 Thu,  7 Feb 2013 21:28:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r17LSQ9l012105;
 Thu, 7 Feb 2013 21:28:26 GMT
 (envelope-from monthadar@svn.freebsd.org)
Received: (from monthadar@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r17LSQY1012104;
 Thu, 7 Feb 2013 21:28:26 GMT
 (envelope-from monthadar@svn.freebsd.org)
Message-Id: <201302072128.r17LSQY1012104@svn.freebsd.org>
From: Monthadar Al Jaberi <monthadar@FreeBSD.org>
Date: Thu, 7 Feb 2013 21:28:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246514 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Feb 2013 21:28:26 -0000

Author: monthadar
Date: Thu Feb  7 21:28:25 2013
New Revision: 246514
URL: http://svnweb.freebsd.org/changeset/base/246514

Log:
  Mesh HWMP: don't send an intermediate PREP for proxy entries.
  
  * The standard is unclear about what should happen in case a mesh STA (not
    marked as a mesh gate) recevies a PREQ for a destination that is marked
    as proxy. Solution for now is not to do intermediate reply at all, and
    let the PREQ reach the mesh gate;
  
  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:27:40 2013	(r246513)
+++ head/sys/net80211/ieee80211_hwmp.c	Thu Feb  7 21:28:25 2013	(r246514)
@@ -1133,9 +1133,11 @@ hwmp_recv_preq(struct ieee80211vap *vap,
 
 		/*
 		 * We have a valid route to this node.
+		 * NB: if target is proxy dont reply.
 		 */
 		if (rttarg != NULL &&
-		    (rttarg->rt_flags & IEEE80211_MESHRT_FLAGS_VALID)) {
+		    rttarg->rt_flags & IEEE80211_MESHRT_FLAGS_VALID &&
+		    !(rttarg->rt_flags & IEEE80211_MESHRT_FLAGS_PROXY)) {
 			/*
 			 * Check if we can send an intermediate Path Reply,
 			 * i.e., Target Only bit is not set and target is not