CVS commit: src

[Nick Hudson <skrll%netbsd.org@localhost>]

Module Name:    src
Committed By:   skrll
Date:           Fri Nov 18 16:20:47 UTC 2005

Update of /cvsroot/src
In directory ivanova.netbsd.org:/tmp/cvs-serv25310

Log Message:
Import FreeBSD's net80211(9) of 1-nov-2005

Status:

Vendor Tag:     FreeBSD
Release Tags:   net80211-1-nov-2005
                
C src/sys/net80211/ieee80211_acl.c
U src/sys/net80211/_ieee80211.h
C src/sys/net80211/ieee80211.c
C src/sys/net80211/ieee80211.h
U src/sys/net80211/ieee80211_crypto_ccmp.c
C src/sys/net80211/ieee80211_crypto.c
C src/sys/net80211/ieee80211_crypto.h
U src/sys/net80211/ieee80211_crypto_none.c
C src/sys/net80211/ieee80211_crypto_tkip.c
U src/sys/net80211/ieee80211_crypto_wep.c
C src/sys/net80211/ieee80211_netbsd.c
C src/sys/net80211/ieee80211_netbsd.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
U src/sys/net80211/ieee80211_radiotap.h
C src/sys/net80211/ieee80211_var.h
U src/sys/net80211/ieee80211_xauth.c

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

        cvs checkout -jFreeBSD:yesterday -jFreeBSD src