From owner-p4-projects@FreeBSD.ORG  Thu Feb 21 05:59:12 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 957BC16A403; Thu, 21 Feb 2008 05:59:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 37FFD16A400
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 05:59:12 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2C9E413C4D9
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 05:59:12 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1L5xBpJ064339
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 05:59:11 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1L5xBWH064336
	for perforce@freebsd.org; Thu, 21 Feb 2008 05:59:11 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 21 Feb 2008 05:59:11 GMT
Message-Id: <200802210559.m1L5xBWH064336@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135872 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Feb 2008 05:59:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=135872

Change 135872 by sam@sam_ebb on 2008/02/21 05:58:45

	Propagate private mbuf flags when inserting an mbuf during
	encap. Our private flags are not defined as part of M_COPYFLAGS
	so we lost M_EAPOL (and potentially other bits) and broke WPA.

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_output.c#34 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#34 (text+ko) ====

@@ -737,6 +737,7 @@
 		m_move_pkthdr(n, m);
 		n->m_len = 0;			/* NB: m_gethdr does not set */
 		n->m_data += needed_space;
+		n->m_flags |= m->m_flags & M_80211_TX;
 		/*
 		 * Pull up Ethernet header to create the expected layout.
 		 * We could use m_pullup but that's overkill (i.e. we don't