From owner-p4-projects@FreeBSD.ORG  Mon Feb  2 14:49: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 C035B16A4D2; Mon,  2 Feb 2004 14:49:34 -0800 (PST)
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 736D516A4CE
	for <perforce@freebsd.org>; Mon,  2 Feb 2004 14:49:34 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ED50043D41
	for <perforce@freebsd.org>; Mon,  2 Feb 2004 14:49:32 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i12MnW0B089393
	for <perforce@freebsd.org>; Mon, 2 Feb 2004 14:49:32 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i12MnWZY089390
	for perforce@freebsd.org; Mon, 2 Feb 2004 14:49:32 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Mon, 2 Feb 2004 14:49:32 -0800 (PST)
Message-Id: <200402022249.i12MnWZY089390@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 46382 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: Mon, 02 Feb 2004 22:49:35 -0000

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

Change 46382 by sam@sam_ebb on 2004/02/02 14:49:22

	whitespace sync with madwifi

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#14 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#14 (text+ko) ====

@@ -468,9 +468,9 @@
 		/* should not come here */
 		break;
 	}
-  err:
+err:
 	ifp->if_ierrors++;
-  out:
+out:
 	if (m != NULL) {
 		if (ic->ic_rawbpf)
 			bpf_mtap(ic->ic_rawbpf, m);
@@ -1227,7 +1227,6 @@
 		/*
 		 * Honor ERP: enable protection and/or disable
 		 * the use of short slot time.
-		 * XXX where do we reset this state?
 		 */
 		if (erp & IEEE80211_ERP_USE_PROTECTION)
 			ic->ic_flags |= IEEE80211_F_USEPROT;