Module Name:	src
Committed By:	dyoung
Date:		Wed Jun 22 06:16:16 UTC 2005

Modified Files:
	src/distrib/sets/lists/comp: mi
	src/sbin/ifconfig: ieee80211.c
	src/sys/arch/i386: Makefile
	src/sys/arch/i386/conf: Makefile.i386 files.i386
	src/sys/arch/xen/conf: Makefile.xen files.xen
	src/sys/conf: files
	src/sys/contrib/arch/amd64/dev: athhal-x86_64-elf.hal.o.uue
	    athhal-x86_64-elf.inc
	src/sys/contrib/arch/arm/dev: athhal-arm9-le-thumb-elf.hal.o.uue
	    athhal-arm9-le-thumb-elf.inc athhal-armv4-be-elf.hal.o.uue
	    athhal-armv4-be-elf.inc athhal-armv4-le-elf.hal.o.uue
	    athhal-armv4-le-elf.inc athhal-xscale-be-elf.hal.o.uue
	    athhal-xscale-be-elf.inc athhal-xscale-le-elf.hal.o.uue
	    athhal-xscale-le-elf.inc
	src/sys/contrib/arch/i386/dev: athhal-i386-elf.hal.o.uue
	    athhal-i386-elf.inc
	src/sys/contrib/arch/mips/dev: athhal-mips-be-elf.hal.o.uue
	    athhal-mips-be-elf.inc athhal-mips-le-elf.hal.o.uue
	    athhal-mips-le-elf.inc athhal-mips1-be-elf.hal.o.uue
	    athhal-mips1-be-elf.inc athhal-mips1-le-elf.hal.o.uue
	    athhal-mips1-le-elf.inc athhal-mipsisa32-be-elf.hal.o.uue
	    athhal-mipsisa32-be-elf.inc athhal-mipsisa32-le-elf.hal.o.uue
	    athhal-mipsisa32-le-elf.inc
	src/sys/contrib/arch/powerpc/dev: athhal-powerpc-be-eabi.hal.o.uue
	    athhal-powerpc-be-eabi.inc athhal-powerpc-le-eabi.hal.o.uue
	    athhal-powerpc-le-eabi.inc
	src/sys/contrib/arch/sh3/dev: athhal-sh4-le-elf.hal.o.uue
	    athhal-sh4-le-elf.inc
	src/sys/contrib/dev/ic: athhal.h athhal_desc.h athhal_devid.h
	    athhal_osdep.c athhal_osdep.h athhal_version.h
	src/sys/dev/cardbus: if_ath_cardbus.c if_atw_cardbus.c if_rtw_cardbus.c
	src/sys/dev/ic: an.c anvar.h ath.c athioctl.h athrate-amrr.c
	    athrate-onoe.c athrate-sample.c athvar.h atw.c atwvar.h awi.c
	    awivar.h rtw.c rtwphy.c rtwphyio.c rtwvar.h smc93cx6.c
	    smc93cx6var.h wi.c wivar.h
	src/sys/dev/isapnp: if_an_isapnp.c
	src/sys/dev/pci: if_an_pci.c if_ath_pci.c if_atw_pci.c if_ipw.c
	    if_ipwvar.h if_iwi.c if_iwivar.h if_rtw_pci.c if_wi_pci.c
	src/sys/dev/pcmcia: if_an_pcmcia.c if_awi_pcmcia.c if_wi_pcmcia.c
	src/sys/dev/usb: if_atu.c if_atureg.h
	src/sys/net: if.c if.h route.h rtsock.c
	src/sys/net80211: Makefile ieee80211.c ieee80211.h ieee80211_acl.c
	    ieee80211_crypto.c ieee80211_crypto.h ieee80211_crypto_ccmp.c
	    ieee80211_crypto_none.c ieee80211_crypto_tkip.c
	    ieee80211_crypto_wep.c ieee80211_input.c ieee80211_ioctl.c
	    ieee80211_ioctl.h ieee80211_netbsd.c ieee80211_netbsd.h
	    ieee80211_node.c ieee80211_node.h ieee80211_output.c
	    ieee80211_proto.c ieee80211_proto.h ieee80211_radiotap.h
	    ieee80211_rssadapt.c ieee80211_sysctl.h ieee80211_var.h
	    ieee80211_xauth.c
	src/usr.sbin/wlanctl: wlanctl.c
Added Files:
	src/sys/dev/ic: ath_netbsd.c ath_netbsd.h
Removed Files:
	src/contrib/sys/arch/i386/dev: athhal-elf-o.inc athhal-elf-o.uue
	    athhal_opt.h
	src/contrib/sys/dev/ic: athhal-COPYRIGHT athhal-README athhal.h
	    athhal_desc.h athhal_devid.h athhal_osdep.c athhal_osdep.h
	    athhal_version.h
	src/sys/dev/ic: athcompat.c athcompat.h
	src/sys/net80211: ieee80211_channel.h ieee80211_compat.c
	    ieee80211_compat.h

Log Message:
Resolve conflicts in importation of 18-May-2005 ath(4) / net80211(9)
from FreeBSD.  Introduce compatibility shims (sys/dev/ic/ath_netbsd.[ch],
sys/net80211/ieee80211_netbsd.[ch]).  Update drivers (an, atu, atw,
awi, ipw, iwi, rtw, wi) for the new net80211(9) API.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/contrib/sys/arch/i386/dev/athhal-elf-o.inc
cvs rdiff -r1.2 -r0 src/contrib/sys/arch/i386/dev/athhal-elf-o.uue
cvs rdiff -r1.1.1.2 -r0 src/contrib/sys/arch/i386/dev/athhal_opt.h
cvs rdiff -r1.3 -r0 src/contrib/sys/dev/ic/athhal-COPYRIGHT \
    src/contrib/sys/dev/ic/athhal-README src/contrib/sys/dev/ic/athhal_desc.h
cvs rdiff -r1.5 -r0 src/contrib/sys/dev/ic/athhal.h
cvs rdiff -r1.4 -r0 src/contrib/sys/dev/ic/athhal_devid.h \
    src/contrib/sys/dev/ic/athhal_osdep.h \
    src/contrib/sys/dev/ic/athhal_version.h
cvs rdiff -r1.8 -r0 src/contrib/sys/dev/ic/athhal_osdep.c
cvs rdiff -r1.796 -r1.797 src/distrib/sets/lists/comp/mi
cvs rdiff -r1.1 -r1.2 src/sbin/ifconfig/ieee80211.c
cvs rdiff -r1.24 -r1.25 src/sys/arch/i386/Makefile
cvs rdiff -r1.138 -r1.139 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -r1.266 -r1.267 src/sys/arch/i386/conf/files.i386
cvs rdiff -r1.8 -r1.9 src/sys/arch/xen/conf/Makefile.xen
cvs rdiff -r1.23 -r1.24 src/sys/arch/xen/conf/files.xen
cvs rdiff -r1.718 -r1.719 src/sys/conf/files
cvs rdiff -r1.1.1.1 -r1.2 \
    src/sys/contrib/arch/amd64/dev/athhal-x86_64-elf.hal.o.uue \
    src/sys/contrib/arch/amd64/dev/athhal-x86_64-elf.inc
cvs rdiff -r1.1.1.1 -r1.2 \
    src/sys/contrib/arch/arm/dev/athhal-arm9-le-thumb-elf.hal.o.uue \
    src/sys/contrib/arch/arm/dev/athhal-arm9-le-thumb-elf.inc \
    src/sys/contrib/arch/arm/dev/athhal-armv4-be-elf.hal.o.uue \
    src/sys/contrib/arch/arm/dev/athhal-armv4-be-elf.inc \
    src/sys/contrib/arch/arm/dev/athhal-armv4-le-elf.hal.o.uue \
    src/sys/contrib/arch/arm/dev/athhal-armv4-le-elf.inc \
    src/sys/contrib/arch/arm/dev/athhal-xscale-be-elf.hal.o.uue \
    src/sys/contrib/arch/arm/dev/athhal-xscale-be-elf.inc \
    src/sys/contrib/arch/arm/dev/athhal-xscale-le-elf.hal.o.uue \
    src/sys/contrib/arch/arm/dev/athhal-xscale-le-elf.inc
cvs rdiff -r1.1.1.1 -r1.2 \
    src/sys/contrib/arch/i386/dev/athhal-i386-elf.hal.o.uue \
    src/sys/contrib/arch/i386/dev/athhal-i386-elf.inc
cvs rdiff -r1.1.1.1 -r1.2 \
    src/sys/contrib/arch/mips/dev/athhal-mips-be-elf.hal.o.uue \
    src/sys/contrib/arch/mips/dev/athhal-mips-be-elf.inc \
    src/sys/contrib/arch/mips/dev/athhal-mips-le-elf.hal.o.uue \
    src/sys/contrib/arch/mips/dev/athhal-mips-le-elf.inc \
    src/sys/contrib/arch/mips/dev/athhal-mips1-be-elf.hal.o.uue \
    src/sys/contrib/arch/mips/dev/athhal-mips1-be-elf.inc \
    src/sys/contrib/arch/mips/dev/athhal-mips1-le-elf.hal.o.uue \
    src/sys/contrib/arch/mips/dev/athhal-mips1-le-elf.inc \
    src/sys/contrib/arch/mips/dev/athhal-mipsisa32-be-elf.hal.o.uue \
    src/sys/contrib/arch/mips/dev/athhal-mipsisa32-be-elf.inc \
    src/sys/contrib/arch/mips/dev/athhal-mipsisa32-le-elf.hal.o.uue \
    src/sys/contrib/arch/mips/dev/athhal-mipsisa32-le-elf.inc
cvs rdiff -r1.1.1.1 -r1.2 \
    src/sys/contrib/arch/powerpc/dev/athhal-powerpc-be-eabi.hal.o.uue \
    src/sys/contrib/arch/powerpc/dev/athhal-powerpc-be-eabi.inc \
    src/sys/contrib/arch/powerpc/dev/athhal-powerpc-le-eabi.hal.o.uue \
    src/sys/contrib/arch/powerpc/dev/athhal-powerpc-le-eabi.inc
cvs rdiff -r1.1.1.1 -r1.2 \
    src/sys/contrib/arch/sh3/dev/athhal-sh4-le-elf.hal.o.uue \
    src/sys/contrib/arch/sh3/dev/athhal-sh4-le-elf.inc
cvs rdiff -r1.1.1.1 -r1.2 src/sys/contrib/dev/ic/athhal.h \
    src/sys/contrib/dev/ic/athhal_desc.h \
    src/sys/contrib/dev/ic/athhal_devid.h \
    src/sys/contrib/dev/ic/athhal_osdep.c \
    src/sys/contrib/dev/ic/athhal_osdep.h \
    src/sys/contrib/dev/ic/athhal_version.h
cvs rdiff -r1.6 -r1.7 src/sys/dev/cardbus/if_ath_cardbus.c \
    src/sys/dev/cardbus/if_rtw_cardbus.c
cvs rdiff -r1.11 -r1.12 src/sys/dev/cardbus/if_atw_cardbus.c
cvs rdiff -r1.34 -r1.35 src/sys/dev/ic/an.c
cvs rdiff -r1.10 -r1.11 src/sys/dev/ic/anvar.h src/sys/dev/ic/athvar.h \
    src/sys/dev/ic/smc93cx6.c
cvs rdiff -r1.46 -r1.47 src/sys/dev/ic/ath.c
cvs rdiff -r0 -r1.1 src/sys/dev/ic/ath_netbsd.c src/sys/dev/ic/ath_netbsd.h
cvs rdiff -r1.1 -r0 src/sys/dev/ic/athcompat.c
cvs rdiff -r1.3 -r0 src/sys/dev/ic/athcompat.h
cvs rdiff -r1.6 -r1.7 src/sys/dev/ic/athioctl.h src/sys/dev/ic/rtwphyio.c
cvs rdiff -r1.1.1.1 -r1.2 src/sys/dev/ic/athrate-amrr.c \
    src/sys/dev/ic/athrate-onoe.c src/sys/dev/ic/athrate-sample.c
cvs rdiff -r1.84 -r1.85 src/sys/dev/ic/atw.c
cvs rdiff -r1.15 -r1.16 src/sys/dev/ic/atwvar.h
cvs rdiff -r1.67 -r1.68 src/sys/dev/ic/awi.c
cvs rdiff -r1.20 -r1.21 src/sys/dev/ic/awivar.h
cvs rdiff -r1.47 -r1.48 src/sys/dev/ic/rtw.c
cvs rdiff -r1.5 -r1.6 src/sys/dev/ic/rtwphy.c
cvs rdiff -r1.22 -r1.23 src/sys/dev/ic/rtwvar.h
cvs rdiff -r1.7 -r1.8 src/sys/dev/ic/smc93cx6var.h
cvs rdiff -r1.197 -r1.198 src/sys/dev/ic/wi.c
cvs rdiff -r1.55 -r1.56 src/sys/dev/ic/wivar.h
cvs rdiff -r1.9 -r1.10 src/sys/dev/isapnp/if_an_isapnp.c
cvs rdiff -r1.17 -r1.18 src/sys/dev/pci/if_an_pci.c
cvs rdiff -r1.8 -r1.9 src/sys/dev/pci/if_ath_pci.c src/sys/dev/pci/if_iwi.c
cvs rdiff -r1.9 -r1.10 src/sys/dev/pci/if_atw_pci.c
cvs rdiff -r1.11 -r1.12 src/sys/dev/pci/if_ipw.c
cvs rdiff -r1.5 -r1.6 src/sys/dev/pci/if_ipwvar.h
cvs rdiff -r1.2 -r1.3 src/sys/dev/pci/if_iwivar.h \
    src/sys/dev/pci/if_rtw_pci.c
cvs rdiff -r1.36 -r1.37 src/sys/dev/pci/if_wi_pci.c
cvs rdiff -r1.26 -r1.27 src/sys/dev/pcmcia/if_an_pcmcia.c
cvs rdiff -r1.33 -r1.34 src/sys/dev/pcmcia/if_awi_pcmcia.c
cvs rdiff -r1.65 -r1.66 src/sys/dev/pcmcia/if_wi_pcmcia.c
cvs rdiff -r1.11 -r1.12 src/sys/dev/usb/if_atu.c
cvs rdiff -r1.2 -r1.3 src/sys/dev/usb/if_atureg.h
cvs rdiff -r1.158 -r1.159 src/sys/net/if.c
cvs rdiff -r1.109 -r1.110 src/sys/net/if.h
cvs rdiff -r1.40 -r1.41 src/sys/net/route.h
cvs rdiff -r1.77 -r1.78 src/sys/net/rtsock.c
cvs rdiff -r1.3 -r1.4 src/sys/net80211/Makefile
cvs rdiff -r1.36 -r1.37 src/sys/net80211/ieee80211.c
cvs rdiff -r1.12 -r1.13 src/sys/net80211/ieee80211.h
cvs rdiff -r1.1.1.1 -r1.2 src/sys/net80211/ieee80211_acl.c \
    src/sys/net80211/ieee80211_crypto_ccmp.c \
    src/sys/net80211/ieee80211_crypto_none.c \
    src/sys/net80211/ieee80211_crypto_tkip.c \
    src/sys/net80211/ieee80211_crypto_wep.c \
    src/sys/net80211/ieee80211_netbsd.c src/sys/net80211/ieee80211_xauth.c
cvs rdiff -r1.1 -r0 src/sys/net80211/ieee80211_channel.h
cvs rdiff -r1.3 -r0 src/sys/net80211/ieee80211_compat.c
cvs rdiff -r1.5 -r0 src/sys/net80211/ieee80211_compat.h
cvs rdiff -r1.6 -r1.7 src/sys/net80211/ieee80211_crypto.c
cvs rdiff -r1.2 -r1.3 src/sys/net80211/ieee80211_crypto.h \
    src/sys/net80211/ieee80211_sysctl.h
cvs rdiff -r1.39 -r1.40 src/sys/net80211/ieee80211_input.c
cvs rdiff -r1.18 -r1.19 src/sys/net80211/ieee80211_ioctl.c \
    src/sys/net80211/ieee80211_proto.c src/sys/net80211/ieee80211_var.h
cvs rdiff -r1.8 -r1.9 src/sys/net80211/ieee80211_ioctl.h
cvs rdiff -r1.1 -r1.2 src/sys/net80211/ieee80211_netbsd.h
cvs rdiff -r1.38 -r1.39 src/sys/net80211/ieee80211_node.c
cvs rdiff -r1.15 -r1.16 src/sys/net80211/ieee80211_node.h
cvs rdiff -r1.28 -r1.29 src/sys/net80211/ieee80211_output.c
cvs rdiff -r1.9 -r1.10 src/sys/net80211/ieee80211_proto.h
cvs rdiff -r1.10 -r1.11 src/sys/net80211/ieee80211_radiotap.h \
    src/sys/net80211/ieee80211_rssadapt.c
cvs rdiff -r1.1 -r1.2 src/usr.sbin/wlanctl/wlanctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.