CVS commit: src/sys/net80211

[David Young <dyoung%netbsd.org@localhost>]

Module Name:    src
Committed By:   dyoung
Date:           Thu Apr 29 03:54:40 UTC 2004

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

Log Message:
Import FreeBSD's net80211 of 28-apr-2004

Status:

Vendor Tag:     FreeBSD
Release Tags:   net80211-28-apr-2004
                
C src/sys/net80211/ieee80211.c
C src/sys/net80211/ieee80211.h
U src/sys/net80211/ieee80211_crypto.c
U 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
U src/sys/net80211/ieee80211_proto.h
C src/sys/net80211/ieee80211_radiotap.h
C src/sys/net80211/ieee80211_var.h

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

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