Subject: CVS commit: src/sys/net80211
To: None <source-changes@NetBSD.org>
From: David Young <dyoung@cuw.ojctech.com>
List: source-changes
Date: 02/24/2005 21:22:49
Module Name:	src
Committed By:	dyoung
Date:		Fri Feb 25 03:22:49 UTC 2005

Update of /u3/dyoung/rsync-repo/src/sys/net80211
In directory cuw.ojctech.com:/u3/dyoung/fbsd/src/sys/net80211

Log Message:
Import FreeBSD's net80211 of 24-feb-2005


Vendor Tag:	FreeBSD
Release Tags:	net80211-24-feb-2005
		
I src/sys/net80211/CVS
C src/sys/net80211/ieee80211_crypto.c
C src/sys/net80211/ieee80211.c
C src/sys/net80211/ieee80211.h
N src/sys/net80211/.ieee80211_crypto_wep.c.swp
C src/sys/net80211/ieee80211_crypto.h
C src/sys/net80211/ieee80211_input.c
C src/sys/net80211/ieee80211_ioctl.c
C src/sys/net80211/ieee80211_ioctl.h
C src/sys/net80211/ieee80211_node.c
C src/sys/net80211/ieee80211_node.h
C src/sys/net80211/ieee80211_output.c
C src/sys/net80211/ieee80211_proto.c
C src/sys/net80211/ieee80211_proto.h
C src/sys/net80211/ieee80211_radiotap.h
C src/sys/net80211/ieee80211_var.h
N src/sys/net80211/_ieee80211.h
N src/sys/net80211/ieee80211_acl.c
I src/sys/net80211/tags
N src/sys/net80211/ieee80211_crypto_ccmp.c
N src/sys/net80211/ieee80211_crypto_none.c
N src/sys/net80211/ieee80211_crypto_tkip.c
N src/sys/net80211/ieee80211_crypto_wep.c
N src/sys/net80211/ieee80211_freebsd.c
N src/sys/net80211/ieee80211_freebsd.h
N src/sys/net80211/ieee80211_xauth.c

14 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jFreeBSD:yesterday -jFreeBSD src/sys/net80211