From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  8 11:24:23 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 7D2AF106568B;
	Mon,  8 Jun 2009 11:24:23 +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 6C1C58FC1E;
	Mon,  8 Jun 2009 11:24:23 +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 n58BONhp027971;
	Mon, 8 Jun 2009 11:24:23 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58BONDC027970;
	Mon, 8 Jun 2009 11:24:23 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906081124.n58BONDC027970@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 8 Jun 2009 11:24:23 +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: r193708 - 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: Mon, 08 Jun 2009 11:24:24 -0000

Author: rpaulo
Date: Mon Jun  8 11:24:23 2009
New Revision: 193708
URL: http://svn.freebsd.org/changeset/base/193708

Log:
  Accept from ds frames.
  
  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	Mon Jun  8 11:21:09 2009	(r193707)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Mon Jun  8 11:24:23 2009	(r193708)
@@ -282,6 +282,13 @@ mesh_input(struct ieee80211_node *ni, st
 			    "peer link not yet established (%s)",
 			    nodemeshstates[ni->ni_mlstate]);
 		}	
+		if (dir != IEEE80211_FC1_DIR_FROMDS &&
+		    dir != IEEE80211_FC1_DIR_DSTODS) {
+			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
+			    wh, "data", "incorrect dir 0x%x", dir);
+			vap->iv_stats.is_rx_wrongdir++;
+			goto err;
+		}
 		/* NB: not ieee80211_hdrspace, datapad is not honored */
 		hdrlen = ieee80211_hdrsize(wh)
 		    + sizeof(struct ieee80211_meshcntl);
@@ -293,12 +300,6 @@ mesh_input(struct ieee80211_node *ni, st
 			vap->iv_stats.is_rx_tooshort++;
 			goto out;		/* XXX */
 		}
-		if (dir != IEEE80211_FC1_DIR_DSTODS) {
-			IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
-			    wh, "data", "incorrect dir 0x%x", dir);
-			vap->iv_stats.is_rx_wrongdir++;
-			goto err;
-		}
 		/*
 		 * Save QoS bits for use below--before we strip the header.
 		 */