From owner-p4-projects@FreeBSD.ORG  Tue Feb 13 14:54:36 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9D7EB16A408; Tue, 13 Feb 2007 14:54:36 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3B09E16A407
	for <perforce@FreeBSD.org>; Tue, 13 Feb 2007 14:54:36 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2FC9B13C478
	for <perforce@FreeBSD.org>; Tue, 13 Feb 2007 14:54:36 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1DEsaqA043210
	for <perforce@FreeBSD.org>; Tue, 13 Feb 2007 14:54:36 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1DEsZI6043207
	for perforce@freebsd.org; Tue, 13 Feb 2007 14:54:35 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Tue, 13 Feb 2007 14:54:35 GMT
Message-Id: <200702131454.l1DEsZI6043207@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 114452 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: Tue, 13 Feb 2007 14:54:37 -0000

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

Change 114452 by sephe@sephe_zealot:sam_wifi on 2007/02/13 14:54:08

	For DLT_IEEE802_11 / DLT_IEEE802_11_RADIO packet injection, "header
	complete" option has a side effect:
	It will change sa_family to non-AF_IEEE80211, thus ieee80211_output()
	will fallback to ether_output(), but the buffers injected are actually
	an 802.11 MAC frames.  So ignore "header complete" option if sa_family
	is AF_IEEE80211.

Affected files ...

.. //depot/projects/wifi/sys/net/bpf.c#21 edit

Differences ...

==== //depot/projects/wifi/sys/net/bpf.c#21 (text+ko) ====

@@ -623,7 +623,7 @@
 	if (error)
 		return (error);
 
-	if (d->bd_hdrcmplt)
+	if (d->bd_hdrcmplt && dst.sa_family != AF_IEEE80211)
 		dst.sa_family = pseudo_AF_HDRCMPLT;
 
 #ifdef MAC