From owner-p4-projects@FreeBSD.ORG  Fri Dec 10 22:26:35 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 84C4A16A4D0; Fri, 10 Dec 2004 22:26:35 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 55CB116A4CE
	for <perforce@freebsd.org>; Fri, 10 Dec 2004 22:26:35 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 47A8843D66
	for <perforce@freebsd.org>; Fri, 10 Dec 2004 22:26:35 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBAMQZ6d098417
	for <perforce@freebsd.org>; Fri, 10 Dec 2004 22:26:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBAMQY5N098414
	for perforce@freebsd.org; Fri, 10 Dec 2004 22:26:34 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 10 Dec 2004 22:26:34 GMT
Message-Id: <200412102226.iBAMQY5N098414@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>
Subject: PERFORCE change 66791 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 10 Dec 2004 22:26:36 -0000

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

Change 66791 by sam@sam_ebb on 2004/12/10 22:26:09

	clear WEP bit in 802.11 header after crypto decap so tcpdump
	et. al. are not confused

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#27 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#27 (text+ko) ====

@@ -408,6 +408,7 @@
 				goto out;
 			}
 			wh = mtod(m, struct ieee80211_frame *);
+			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
 		} else {
 			key = NULL;
 		}
@@ -585,6 +586,7 @@
 				/* NB: stats+msgs handled in crypto_decap */
 				goto out;
 			}
+			wh->i_fc[1] &= ~IEEE80211_FC1_WEP;
 		}
 		if (ic->ic_rawbpf)
 			bpf_mtap(ic->ic_rawbpf, m);