From owner-svn-src-projects@FreeBSD.ORG  Tue Apr 28 21:48:07 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 D8239106566C;
	Tue, 28 Apr 2009 21:48:07 +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 C734B8FC18;
	Tue, 28 Apr 2009 21:48:07 +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 n3SLm7FK060754;
	Tue, 28 Apr 2009 21:48:07 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3SLm7ku060753;
	Tue, 28 Apr 2009 21:48:07 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200904282148.n3SLm7ku060753@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 28 Apr 2009 21:48:07 +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: r191640 - 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: Tue, 28 Apr 2009 21:48:08 -0000

Author: rpaulo
Date: Tue Apr 28 21:48:07 2009
New Revision: 191640
URL: http://svn.freebsd.org/changeset/base/191640

Log:
  First code to handle action frames.
  Add a comment so I don't forget to send peering requests.
  
  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	Tue Apr 28 21:00:50 2009	(r191639)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Apr 28 21:48:07 2009	(r191640)
@@ -362,6 +362,13 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 			    subtype, rssi, noise, rstamp);
 			return;
 		}
+
+		/*
+		 * If it's a beacon for our mesh and we haven't already
+		 * peered with this node, send him a mgmt frame with
+		 * peer link IE.
+		 */
+		/* XXX */
 		break;
 	}
 	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
@@ -436,6 +443,11 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		break;
 	}
 	case IEEE80211_FC0_SUBTYPE_ACTION:
+		if (vap->iv_state == IEEE80211_S_RUN) {
+			if (ieee80211_parse_action(ni, m0) == 0)
+				ic->ic_recv_action(ni, frm, efrm);
+		} else
+			vap->iv_stats.is_rx_mgtdiscard++;
 		break;
 	case IEEE80211_FC0_SUBTYPE_AUTH:
 	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: