Module Name:	src
Committed By:	dyoung
Date:		Sun Sep  7 04:05:37 UTC 2003

Update of /cvsroot/src/sys/net80211
In directory minbar.netbsd.org:/tmp/cvs-serv18635

Log Message:
Bring net80211/ sources up-to-date with FreeBSD.

PR:		
Submitted by:	
Reviewed by:	
Approved by:	
Obtained from:	
MFC after:	


Vendor Tag:	FreeBSD
Release Tags:	Sep-6-2003
		
U src/sys/net80211/ieee80211.c
U src/sys/net80211/ieee80211.h
U src/sys/net80211/ieee80211_crypto.c
U src/sys/net80211/ieee80211_crypto.h
U src/sys/net80211/ieee80211_input.c
U src/sys/net80211/ieee80211_ioctl.c
U src/sys/net80211/ieee80211_ioctl.h
U src/sys/net80211/ieee80211_node.c
U src/sys/net80211/ieee80211_node.h
C src/sys/net80211/ieee80211_output.c
U src/sys/net80211/ieee80211_proto.c
U src/sys/net80211/ieee80211_proto.h
U src/sys/net80211/ieee80211_var.h
N src/sys/net80211/ieee80211_radiotap.h

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

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