svn commit: r209167 - in projects/ppc64: . bin/getfacl cddl/contrib/opensolaris/lib/libdtrace/common contrib/llvm/tools/clang/lib/Basic contrib/wpa/hostapd contrib/wpa/hostapd/doc contrib/wpa/src/c...

Nathan Whitehorn nwhitehorn at FreeBSD.org
Mon Jun 14 17:28:33 UTC 2010 

Author: nwhitehorn
Date: Mon Jun 14 17:28:32 2010
New Revision: 209167
URL: http://svn.freebsd.org/changeset/base/209167

Log:
  IFC @ 209166 -- Begin tbemd merge

Added:
  projects/ppc64/contrib/wpa/hostapd/Makefile
     - copied unchanged from r209166, head/contrib/wpa/hostapd/Makefile
  projects/ppc64/contrib/wpa/hostapd/driver_bsd.c
     - copied unchanged from r209166, head/contrib/wpa/hostapd/driver_bsd.c
  projects/ppc64/contrib/wpa/hostapd/driver_hostap.c
     - copied unchanged from r209166, head/contrib/wpa/hostapd/driver_hostap.c
  projects/ppc64/contrib/wpa/hostapd/driver_wired.c
     - copied unchanged from r209166, head/contrib/wpa/hostapd/driver_wired.c
  projects/ppc64/contrib/wpa/hostapd/radiotap.c
     - copied unchanged from r209166, head/contrib/wpa/hostapd/radiotap.c
  projects/ppc64/contrib/wpa/hostapd/radiotap.h
     - copied unchanged from r209166, head/contrib/wpa/hostapd/radiotap.h
  projects/ppc64/contrib/wpa/hostapd/radiotap_iter.h
     - copied unchanged from r209166, head/contrib/wpa/hostapd/radiotap_iter.h
  projects/ppc64/contrib/wpa/src/common/nl80211_copy.h
     - copied unchanged from r209166, head/contrib/wpa/src/common/nl80211_copy.h
  projects/ppc64/contrib/wpa/src/common/wireless_copy.h
     - copied unchanged from r209166, head/contrib/wpa/src/common/wireless_copy.h
  projects/ppc64/contrib/wpa/src/drivers/Makefile
     - copied unchanged from r209166, head/contrib/wpa/src/drivers/Makefile
  projects/ppc64/contrib/wpa/src/drivers/driver_ndis_.c
     - copied unchanged from r209166, head/contrib/wpa/src/drivers/driver_ndis_.c
  projects/ppc64/contrib/wpa/src/drivers/driver_ndiswrapper.c
     - copied unchanged from r209166, head/contrib/wpa/src/drivers/driver_ndiswrapper.c
  projects/ppc64/contrib/wpa/src/drivers/driver_wired.c
     - copied unchanged from r209166, head/contrib/wpa/src/drivers/driver_wired.c
  projects/ppc64/contrib/wpa/src/drivers/ndis_events.c
     - copied unchanged from r209166, head/contrib/wpa/src/drivers/ndis_events.c
  projects/ppc64/contrib/wpa/src/drivers/radiotap.c
     - copied unchanged from r209166, head/contrib/wpa/src/drivers/radiotap.c
  projects/ppc64/contrib/wpa/src/drivers/radiotap.h
     - copied unchanged from r209166, head/contrib/wpa/src/drivers/radiotap.h
  projects/ppc64/contrib/wpa/src/drivers/radiotap_iter.h
     - copied unchanged from r209166, head/contrib/wpa/src/drivers/radiotap_iter.h
  projects/ppc64/contrib/wpa/src/l2_packet/Makefile
     - copied unchanged from r209166, head/contrib/wpa/src/l2_packet/Makefile
  projects/ppc64/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
     - copied unchanged from r209166, head/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
  projects/ppc64/contrib/wpa/src/l2_packet/l2_packet_ndis.c
     - copied unchanged from r209166, head/contrib/wpa/src/l2_packet/l2_packet_ndis.c
  projects/ppc64/contrib/wpa/src/l2_packet/l2_packet_none.c
     - copied unchanged from r209166, head/contrib/wpa/src/l2_packet/l2_packet_none.c
  projects/ppc64/contrib/wpa/src/utils/eloop_none.c
     - copied unchanged from r209166, head/contrib/wpa/src/utils/eloop_none.c
  projects/ppc64/contrib/wpa/src/utils/eloop_win.c
     - copied unchanged from r209166, head/contrib/wpa/src/utils/eloop_win.c
  projects/ppc64/contrib/wpa/src/utils/os_none.c
     - copied unchanged from r209166, head/contrib/wpa/src/utils/os_none.c
  projects/ppc64/contrib/wpa/src/utils/os_win32.c
     - copied unchanged from r209166, head/contrib/wpa/src/utils/os_win32.c
  projects/ppc64/contrib/wpa/wpa_supplicant/Makefile
     - copied unchanged from r209166, head/contrib/wpa/wpa_supplicant/Makefile
  projects/ppc64/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c
     - copied unchanged from r209166, head/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c
  projects/ppc64/contrib/wpa/wpa_supplicant/main_none.c
     - copied unchanged from r209166, head/contrib/wpa/wpa_supplicant/main_none.c
  projects/ppc64/contrib/wpa/wpa_supplicant/nmake.mak
     - copied unchanged from r209166, head/contrib/wpa/wpa_supplicant/nmake.mak
  projects/ppc64/lib/libc/posix1e/acl_id_to_name.c
     - copied unchanged from r209166, head/lib/libc/posix1e/acl_id_to_name.c
  projects/ppc64/lib/libedit/filecomplete.c
     - copied unchanged from r209166, head/lib/libedit/filecomplete.c
  projects/ppc64/lib/libedit/filecomplete.h
     - copied unchanged from r209166, head/lib/libedit/filecomplete.h
  projects/ppc64/share/mk/bsd.arch.inc.mk
     - copied unchanged from r209166, head/share/mk/bsd.arch.inc.mk
     - copied unchanged from r209166, head/sys/arm/conf/SHEEVAPLUG
  projects/ppc64/sys/arm/include/fdt.h
     - copied unchanged from r209166, head/sys/arm/include/fdt.h
  projects/ppc64/sys/arm/include/ofw_machdep.h
     - copied unchanged from r209166, head/sys/arm/include/ofw_machdep.h
  projects/ppc64/sys/dev/fdt/fdt_arm.c
     - copied unchanged from r209166, head/sys/dev/fdt/fdt_arm.c
  projects/ppc64/sys/dev/usb/controller/ehci_mv.c
     - copied unchanged from r209166, head/sys/dev/usb/controller/ehci_mv.c
Directory Properties:
  projects/ppc64/sys/arm/conf/SHEEVAPLUG   (props changed)
Deleted:
  projects/ppc64/contrib/wpa/hostapd/.gitignore
  projects/ppc64/contrib/wpa/hostapd/doc/.gitignore
  projects/ppc64/contrib/wpa/src/common/.gitignore
  projects/ppc64/contrib/wpa/src/crypto/.gitignore
  projects/ppc64/contrib/wpa/src/eap_common/.gitignore
  projects/ppc64/contrib/wpa/src/eap_peer/.gitignore
  projects/ppc64/contrib/wpa/src/eap_server/.gitignore
  projects/ppc64/contrib/wpa/src/eapol_supp/.gitignore
  projects/ppc64/contrib/wpa/src/hlr_auc_gw/.gitignore
  projects/ppc64/contrib/wpa/src/radius/.gitignore
  projects/ppc64/contrib/wpa/src/rsn_supp/.gitignore
  projects/ppc64/contrib/wpa/src/tls/.gitignore
  projects/ppc64/contrib/wpa/src/utils/.gitignore
  projects/ppc64/contrib/wpa/src/wps/.gitignore
  projects/ppc64/contrib/wpa/wpa_supplicant/.gitignore
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/.gitignore
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore
  projects/ppc64/sys/arm/mv/discovery/db78xxx.c
  projects/ppc64/sys/arm/mv/kirkwood/db88f6xxx.c
  projects/ppc64/sys/arm/mv/kirkwood/files.db88f6xxx
  projects/ppc64/sys/arm/mv/obio.c
  projects/ppc64/sys/dev/uart/uart_bus_mbus.c
  projects/ppc64/sys/dev/uart/uart_cpu_mv.c
  projects/ppc64/sys/dev/usb/controller/ehci_mbus.c
  projects/ppc64/usr.bin/tftp/extern.h
  projects/ppc64/usr.bin/tftp/tftpsubs.c
  projects/ppc64/usr.bin/tftp/tftpsubs.h
  projects/ppc64/usr.sbin/wpa/l2_packet.c
  projects/ppc64/usr.sbin/wpa/wpa_supplicant/driver_wired.c
Modified:
  projects/ppc64/Makefile
  projects/ppc64/Makefile.inc1
  projects/ppc64/bin/getfacl/getfacl.1
  projects/ppc64/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
  projects/ppc64/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/ppc64/contrib/wpa/hostapd/ChangeLog
  projects/ppc64/contrib/wpa/hostapd/README-WPS
  projects/ppc64/contrib/wpa/hostapd/ap.h
  projects/ppc64/contrib/wpa/hostapd/beacon.c
  projects/ppc64/contrib/wpa/hostapd/config.c
  projects/ppc64/contrib/wpa/hostapd/config.h
  projects/ppc64/contrib/wpa/hostapd/ctrl_iface.c
  projects/ppc64/contrib/wpa/hostapd/drivers.c
  projects/ppc64/contrib/wpa/hostapd/hostapd.8
  projects/ppc64/contrib/wpa/hostapd/hostapd.c
  projects/ppc64/contrib/wpa/hostapd/hostapd.conf
  projects/ppc64/contrib/wpa/hostapd/hostapd_cli.1
  projects/ppc64/contrib/wpa/hostapd/hostapd_cli.c
  projects/ppc64/contrib/wpa/hostapd/hw_features.c
  projects/ppc64/contrib/wpa/hostapd/ieee802_11.c
  projects/ppc64/contrib/wpa/hostapd/ieee802_1x.c
  projects/ppc64/contrib/wpa/hostapd/preauth.c
  projects/ppc64/contrib/wpa/hostapd/wme.c
  projects/ppc64/contrib/wpa/hostapd/wme.h
  projects/ppc64/contrib/wpa/hostapd/wpa.c
  projects/ppc64/contrib/wpa/hostapd/wpa.h
  projects/ppc64/contrib/wpa/hostapd/wpa_auth_i.h
  projects/ppc64/contrib/wpa/hostapd/wpa_auth_ie.c
  projects/ppc64/contrib/wpa/hostapd/wpa_ft.c
  projects/ppc64/contrib/wpa/hostapd/wps_hostapd.c
  projects/ppc64/contrib/wpa/hostapd/wps_hostapd.h
  projects/ppc64/contrib/wpa/src/common/ieee802_11_common.c
  projects/ppc64/contrib/wpa/src/common/ieee802_11_common.h
  projects/ppc64/contrib/wpa/src/common/ieee802_11_defs.h
  projects/ppc64/contrib/wpa/src/common/version.h
  projects/ppc64/contrib/wpa/src/common/wpa_common.c
  projects/ppc64/contrib/wpa/src/crypto/crypto_cryptoapi.c
  projects/ppc64/contrib/wpa/src/crypto/crypto_gnutls.c
  projects/ppc64/contrib/wpa/src/crypto/crypto_internal.c
  projects/ppc64/contrib/wpa/src/crypto/dh_groups.c
  projects/ppc64/contrib/wpa/src/crypto/ms_funcs.c
  projects/ppc64/contrib/wpa/src/crypto/rc4.c
  projects/ppc64/contrib/wpa/src/crypto/rc4.h
  projects/ppc64/contrib/wpa/src/crypto/sha1.c
  projects/ppc64/contrib/wpa/src/crypto/sha256.c
  projects/ppc64/contrib/wpa/src/crypto/tls.h
  projects/ppc64/contrib/wpa/src/crypto/tls_gnutls.c
  projects/ppc64/contrib/wpa/src/crypto/tls_openssl.c
  projects/ppc64/contrib/wpa/src/drivers/driver.h
  projects/ppc64/contrib/wpa/src/drivers/driver_ndis.c
  projects/ppc64/contrib/wpa/src/eap_common/eap_defs.h
  projects/ppc64/contrib/wpa/src/eap_common/eap_fast_common.h
  projects/ppc64/contrib/wpa/src/eap_common/eap_tlv_common.h
  projects/ppc64/contrib/wpa/src/eap_peer/eap_fast.c
  projects/ppc64/contrib/wpa/src/eap_peer/eap_gpsk.c
  projects/ppc64/contrib/wpa/src/eap_peer/eap_methods.h
  projects/ppc64/contrib/wpa/src/eap_peer/eap_sim.c
  projects/ppc64/contrib/wpa/src/eap_peer/eap_tls_common.c
  projects/ppc64/contrib/wpa/src/eap_peer/eap_tnc.c
  projects/ppc64/contrib/wpa/src/eap_peer/eap_ttls.c
  projects/ppc64/contrib/wpa/src/eap_peer/eap_wsc.c
  projects/ppc64/contrib/wpa/src/eap_peer/tncc.c
  projects/ppc64/contrib/wpa/src/eap_server/eap.c
  projects/ppc64/contrib/wpa/src/eap_server/eap_fast.c
  projects/ppc64/contrib/wpa/src/eap_server/eap_gpsk.c
  projects/ppc64/contrib/wpa/src/eap_server/eap_i.h
  projects/ppc64/contrib/wpa/src/eap_server/eap_tls_common.c
  projects/ppc64/contrib/wpa/src/eap_server/eap_tnc.c
  projects/ppc64/contrib/wpa/src/eap_server/eap_ttls.c
  projects/ppc64/contrib/wpa/src/eapol_supp/eapol_supp_sm.c
  projects/ppc64/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c
  projects/ppc64/contrib/wpa/src/radius/radius_client.c
  projects/ppc64/contrib/wpa/src/radius/radius_server.c
  projects/ppc64/contrib/wpa/src/rsn_supp/wpa.c
  projects/ppc64/contrib/wpa/src/rsn_supp/wpa_ft.c
  projects/ppc64/contrib/wpa/src/rsn_supp/wpa_i.h
  projects/ppc64/contrib/wpa/src/tls/rsa.c
  projects/ppc64/contrib/wpa/src/tls/tlsv1_client.c
  projects/ppc64/contrib/wpa/src/tls/tlsv1_server_read.c
  projects/ppc64/contrib/wpa/src/utils/base64.c
  projects/ppc64/contrib/wpa/src/utils/common.c
  projects/ppc64/contrib/wpa/src/utils/common.h
  projects/ppc64/contrib/wpa/src/utils/os_unix.c
  projects/ppc64/contrib/wpa/src/utils/wpa_debug.c
  projects/ppc64/contrib/wpa/src/utils/wpa_debug.h
  projects/ppc64/contrib/wpa/src/utils/wpabuf.c
  projects/ppc64/contrib/wpa/src/wps/httpread.c
  projects/ppc64/contrib/wpa/src/wps/wps.h
  projects/ppc64/contrib/wpa/src/wps/wps_attr_parse.c
  projects/ppc64/contrib/wpa/src/wps/wps_common.c
  projects/ppc64/contrib/wpa/src/wps/wps_enrollee.c
  projects/ppc64/contrib/wpa/src/wps/wps_i.h
  projects/ppc64/contrib/wpa/src/wps/wps_registrar.c
  projects/ppc64/contrib/wpa/src/wps/wps_upnp.c
  projects/ppc64/contrib/wpa/src/wps/wps_upnp_event.c
  projects/ppc64/contrib/wpa/src/wps/wps_upnp_i.h
  projects/ppc64/contrib/wpa/src/wps/wps_upnp_ssdp.c
  projects/ppc64/contrib/wpa/src/wps/wps_upnp_web.c
  projects/ppc64/contrib/wpa/wpa_supplicant/ChangeLog
  projects/ppc64/contrib/wpa/wpa_supplicant/README
  projects/ppc64/contrib/wpa/wpa_supplicant/README-WPS
  projects/ppc64/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c
  projects/ppc64/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h
  projects/ppc64/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c
  projects/ppc64/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h
  projects/ppc64/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c
  projects/ppc64/contrib/wpa/wpa_supplicant/defconfig
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
  projects/ppc64/contrib/wpa/wpa_supplicant/doc/porting.doxygen
  projects/ppc64/contrib/wpa/wpa_supplicant/eapol_test.c
  projects/ppc64/contrib/wpa/wpa_supplicant/events.c
  projects/ppc64/contrib/wpa/wpa_supplicant/mlme.c
  projects/ppc64/contrib/wpa/wpa_supplicant/scan.c
  projects/ppc64/contrib/wpa/wpa_supplicant/wpa_priv.c
  projects/ppc64/contrib/wpa/wpa_supplicant/wpa_supplicant.c
  projects/ppc64/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h
  projects/ppc64/contrib/wpa/wpa_supplicant/wpas_glue.c
  projects/ppc64/contrib/wpa/wpa_supplicant/wps_supplicant.c
  projects/ppc64/etc/Makefile
  projects/ppc64/games/random/random.c
  projects/ppc64/games/random/randomize_fd.c
  projects/ppc64/gnu/usr.bin/Makefile
  projects/ppc64/include/histedit.h
  projects/ppc64/lib/clang/clang.build.mk
  projects/ppc64/lib/clang/include/llvm/Config/config.h
  projects/ppc64/lib/libarchive/archive_entry.3
  projects/ppc64/lib/libarchive/archive_read.3
  projects/ppc64/lib/libarchive/archive_read_disk.3
  projects/ppc64/lib/libarchive/archive_util.3
  projects/ppc64/lib/libarchive/archive_write.3
  projects/ppc64/lib/libarchive/archive_write_disk.3
  projects/ppc64/lib/libarchive/libarchive-formats.5
  projects/ppc64/lib/libarchive/tar.5
  projects/ppc64/lib/libc/gen/getcap.3
  projects/ppc64/lib/libc/net/sctp_recvmsg.3
  projects/ppc64/lib/libc/posix1e/Makefile.inc
  projects/ppc64/lib/libc/posix1e/acl_support.c
  projects/ppc64/lib/libc/stdlib/atexit.c
  projects/ppc64/lib/libedit/Makefile
  projects/ppc64/lib/libelf/elf_getbase.3
  projects/ppc64/lib/libelf/elf_getbase.c
  projects/ppc64/lib/libkse/Makefile
  projects/ppc64/lib/libkse/arch/amd64/Makefile.inc
  projects/ppc64/lib/libkse/arch/arm/Makefile.inc
  projects/ppc64/lib/libkse/arch/i386/Makefile.inc
  projects/ppc64/lib/libkse/arch/ia64/Makefile.inc
  projects/ppc64/lib/libkse/arch/powerpc/Makefile.inc
  projects/ppc64/lib/libkse/arch/sparc64/Makefile.inc
  projects/ppc64/lib/libkse/support/Makefile.inc
  projects/ppc64/lib/liblzma/config.h
  projects/ppc64/lib/msun/Symbol.map
  projects/ppc64/lib/msun/src/math.h
  projects/ppc64/lib/msun/src/s_isnan.c
  projects/ppc64/sbin/camcontrol/modeedit.c
  projects/ppc64/sbin/ccdconfig/ccdconfig.c
  projects/ppc64/sbin/gbde/gbde.c
  projects/ppc64/sbin/gvinum/gvinum.c
  projects/ppc64/sbin/iscontrol/config.c
  projects/ppc64/share/man/man1/builtin.1
  projects/ppc64/share/man/man4/ae.4
  projects/ppc64/share/man/man4/io.4
  projects/ppc64/share/man/man4/textdump.4
  projects/ppc64/share/man/man9/bus_generic_new_pass.9
  projects/ppc64/share/man/man9/bus_set_pass.9
  projects/ppc64/share/man/man9/insmntque.9
  projects/ppc64/share/man/man9/vfs_mountedfrom.9
  projects/ppc64/share/misc/committers-ports.dot
  projects/ppc64/share/mk/bsd.own.mk
  projects/ppc64/share/mk/sys.mk
  projects/ppc64/share/termcap/termcap.5
  projects/ppc64/sys/amd64/acpica/madt.c
  projects/ppc64/sys/amd64/amd64/intr_machdep.c
  projects/ppc64/sys/amd64/amd64/legacy.c
  projects/ppc64/sys/amd64/amd64/pmap.c
  projects/ppc64/sys/arm/arm/nexus.c
  projects/ppc64/sys/arm/arm/pmap.c
  projects/ppc64/sys/arm/conf/DB-78XXX
  projects/ppc64/sys/arm/conf/DB-88F5XXX
  projects/ppc64/sys/arm/conf/DB-88F6XXX
  projects/ppc64/sys/arm/include/metadata.h
  projects/ppc64/sys/arm/mv/bus_space.c
  projects/ppc64/sys/arm/mv/common.c
  projects/ppc64/sys/arm/mv/discovery/discovery.c
  projects/ppc64/sys/arm/mv/discovery/files.db78xxx
  projects/ppc64/sys/arm/mv/files.mv
  projects/ppc64/sys/arm/mv/gpio.c
  projects/ppc64/sys/arm/mv/ic.c
  projects/ppc64/sys/arm/mv/kirkwood/kirkwood.c
  projects/ppc64/sys/arm/mv/kirkwood/sheevaplug.c
  projects/ppc64/sys/arm/mv/kirkwood/std.db88f6xxx
  projects/ppc64/sys/arm/mv/kirkwood/std.sheevaplug
  projects/ppc64/sys/arm/mv/mv_machdep.c
  projects/ppc64/sys/arm/mv/mv_pci.c
  projects/ppc64/sys/arm/mv/mv_sata.c
  projects/ppc64/sys/arm/mv/mvreg.h
  projects/ppc64/sys/arm/mv/mvvar.h
  projects/ppc64/sys/arm/mv/mvwin.h
  projects/ppc64/sys/arm/mv/orion/db88f5xxx.c
  projects/ppc64/sys/arm/mv/orion/orion.c
  projects/ppc64/sys/arm/mv/rtc.c
  projects/ppc64/sys/arm/mv/timer.c
  projects/ppc64/sys/arm/mv/twsi.c
  projects/ppc64/sys/boot/arm/uboot/Makefile
  projects/ppc64/sys/boot/i386/pxeldr/Makefile
  projects/ppc64/sys/boot/powerpc/uboot/Makefile
  projects/ppc64/sys/boot/uboot/common/metadata.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/ppc64/sys/cddl/dev/cyclic/cyclic.c
  projects/ppc64/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/ppc64/sys/cddl/dev/dtrace/dtrace_debug.c
  projects/ppc64/sys/cddl/dev/dtrace/dtrace_load.c
  projects/ppc64/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  projects/ppc64/sys/compat/linprocfs/linprocfs.c
  projects/ppc64/sys/compat/ndis/subr_usbd.c
  projects/ppc64/sys/conf/Makefile.arm
  projects/ppc64/sys/conf/files
  projects/ppc64/sys/conf/files.arm
  projects/ppc64/sys/conf/options.arm
  projects/ppc64/sys/dev/acpi_support/acpi_asus.c
  projects/ppc64/sys/dev/acpi_support/acpi_fujitsu.c
  projects/ppc64/sys/dev/acpi_support/acpi_hp.c
  projects/ppc64/sys/dev/acpi_support/acpi_ibm.c
  projects/ppc64/sys/dev/acpica/acpi_cpu.c
  projects/ppc64/sys/dev/acpica/acpi_dock.c
  projects/ppc64/sys/dev/acpica/acpi_thermal.c
  projects/ppc64/sys/dev/acpica/acpi_video.c
  projects/ppc64/sys/dev/ath/if_ath.c
  projects/ppc64/sys/dev/cxgb/cxgb_adapter.h
  projects/ppc64/sys/dev/cxgb/cxgb_main.c
  projects/ppc64/sys/dev/cxgb/cxgb_sge.c
  projects/ppc64/sys/dev/e1000/if_igb.c
  projects/ppc64/sys/dev/fdt/fdtbus.c
  projects/ppc64/sys/dev/ixgbe/ixgbe.c
  projects/ppc64/sys/dev/mge/if_mge.c
  projects/ppc64/sys/dev/mge/if_mgevar.h
  projects/ppc64/sys/dev/pci/pci.c
  projects/ppc64/sys/dev/pci/pcivar.h
  projects/ppc64/sys/dev/usb/usb_dev.c
  projects/ppc64/sys/dev/usb/usb_device.c
  projects/ppc64/sys/dev/usb/usb_process.c
  projects/ppc64/sys/dev/usb/wlan/if_run.c
  projects/ppc64/sys/dev/usb/wlan/if_runvar.h
  projects/ppc64/sys/fs/nfsclient/nfs_clbio.c
  projects/ppc64/sys/fs/nfsclient/nfs_clcomsubs.c
  projects/ppc64/sys/fs/nfsclient/nfs_clrpcops.c
  projects/ppc64/sys/fs/nfsclient/nfs_clsubs.c
  projects/ppc64/sys/fs/nfsclient/nfs_clvnops.c
  projects/ppc64/sys/fs/nfsserver/nfs_nfsdsocket.c
  projects/ppc64/sys/fs/procfs/procfs_type.c
  projects/ppc64/sys/geom/geom_dev.c
  projects/ppc64/sys/i386/acpica/madt.c
  projects/ppc64/sys/i386/i386/intr_machdep.c
  projects/ppc64/sys/i386/i386/legacy.c
  projects/ppc64/sys/i386/i386/mp_machdep.c
  projects/ppc64/sys/i386/i386/pmap.c
  projects/ppc64/sys/i386/i386/tsc.c
  projects/ppc64/sys/i386/xen/pmap.c
  projects/ppc64/sys/ia64/ia64/busdma_machdep.c
  projects/ppc64/sys/ia64/ia64/exception.S
  projects/ppc64/sys/ia64/ia64/pmap.c
  projects/ppc64/sys/ia64/ia64/vm_machdep.c
  projects/ppc64/sys/ia64/include/md_var.h
  projects/ppc64/sys/kern/bus_if.m
  projects/ppc64/sys/kern/kern_clock.c
  projects/ppc64/sys/kern/kern_conf.c
  projects/ppc64/sys/kern/kern_switch.c
  projects/ppc64/sys/kern/kern_timeout.c
  projects/ppc64/sys/kern/sched_4bsd.c
  projects/ppc64/sys/kern/sched_ule.c
  projects/ppc64/sys/kern/subr_bus.c
  projects/ppc64/sys/kern/subr_kdb.c
  projects/ppc64/sys/kern/subr_lock.c
  projects/ppc64/sys/kern/subr_pcpu.c
  projects/ppc64/sys/kern/subr_smp.c
  projects/ppc64/sys/kern/subr_taskqueue.c
  projects/ppc64/sys/kern/sysv_sem.c
  projects/ppc64/sys/kern/sysv_shm.c
  projects/ppc64/sys/kern/vfs_bio.c
  projects/ppc64/sys/mips/mips/pmap.c
  projects/ppc64/sys/net/flowtable.c
  projects/ppc64/sys/net/if_epair.c
  projects/ppc64/sys/net/netisr.c
  projects/ppc64/sys/net80211/ieee80211_rssadapt.c
  projects/ppc64/sys/netinet/sctp_pcb.c
  projects/ppc64/sys/netinet/sctp_usrreq.c
  projects/ppc64/sys/netinet/sctputil.c
  projects/ppc64/sys/nfsclient/nfs_bio.c
  projects/ppc64/sys/nfsclient/nfs_subs.c
  projects/ppc64/sys/nfsclient/nfs_vnops.c
  projects/ppc64/sys/powerpc/aim/mmu_oea.c
  projects/ppc64/sys/powerpc/aim/mmu_oea64.c
  projects/ppc64/sys/powerpc/aim/mp_cpudep.c
  projects/ppc64/sys/powerpc/aim/platform_chrp.c
  projects/ppc64/sys/powerpc/booke/pmap.c
  projects/ppc64/sys/sparc64/sparc64/mp_locore.S
  projects/ppc64/sys/sparc64/sparc64/pmap.c
  projects/ppc64/sys/sun4v/sun4v/pmap.c
  projects/ppc64/sys/sys/buf.h
  projects/ppc64/sys/sys/bus.h
  projects/ppc64/sys/sys/conf.h
  projects/ppc64/sys/sys/file.h
  projects/ppc64/sys/sys/pcpu.h
  projects/ppc64/sys/sys/smp.h
  projects/ppc64/sys/sys/vnode.h
  projects/ppc64/sys/ufs/ffs/ffs_softdep.c
  projects/ppc64/sys/vm/uma_core.c
  projects/ppc64/sys/x86/x86/mca.c
  projects/ppc64/sys/x86/x86/msi.c
  projects/ppc64/usr.bin/clang/Makefile
  projects/ppc64/usr.bin/hexdump/od.1
  projects/ppc64/usr.bin/tar/read.c
  projects/ppc64/usr.bin/tar/write.c
  projects/ppc64/usr.sbin/Makefile
  projects/ppc64/usr.sbin/arp/arp.c
  projects/ppc64/usr.sbin/config/mkmakefile.c
  projects/ppc64/usr.sbin/nfscbd/nfscbd.8
  projects/ppc64/usr.sbin/service/service.8
  projects/ppc64/usr.sbin/sysinstall/Makefile
  projects/ppc64/usr.sbin/sysinstall/disks.c
  projects/ppc64/usr.sbin/sysinstall/install.c
  projects/ppc64/usr.sbin/sysinstall/installUpgrade.c
  projects/ppc64/usr.sbin/sysinstall/media.c
  projects/ppc64/usr.sbin/sysinstall/sysinstall.h
  projects/ppc64/usr.sbin/sysinstall/system.c
  projects/ppc64/usr.sbin/sysinstall/tcpip.c
  projects/ppc64/usr.sbin/wpa/hostapd/Makefile
  projects/ppc64/usr.sbin/wpa/wpa_supplicant/Makefile
Directory Properties:
  projects/ppc64/   (props changed)
  projects/ppc64/cddl/contrib/opensolaris/   (props changed)
  projects/ppc64/contrib/ee/   (props changed)
  projects/ppc64/contrib/expat/   (props changed)
  projects/ppc64/contrib/file/   (props changed)
  projects/ppc64/contrib/gdb/   (props changed)
  projects/ppc64/contrib/gnu-sort/   (props changed)
  projects/ppc64/contrib/groff/   (props changed)
  projects/ppc64/contrib/less/   (props changed)
  projects/ppc64/contrib/libpcap/   (props changed)
  projects/ppc64/contrib/ncurses/   (props changed)
  projects/ppc64/contrib/one-true-awk/   (props changed)
  projects/ppc64/contrib/openbsm/   (props changed)
  projects/ppc64/contrib/openpam/   (props changed)
  projects/ppc64/contrib/pf/   (props changed)
  projects/ppc64/contrib/tcpdump/   (props changed)
  projects/ppc64/contrib/tcsh/   (props changed)
  projects/ppc64/contrib/tzcode/stdtime/   (props changed)
  projects/ppc64/contrib/tzcode/zic/   (props changed)
  projects/ppc64/contrib/tzdata/   (props changed)
  projects/ppc64/contrib/wpa/   (props changed)
  projects/ppc64/lib/libutil/   (props changed)
  projects/ppc64/lib/libz/   (props changed)
  projects/ppc64/sbin/   (props changed)
  projects/ppc64/sbin/ipfw/   (props changed)
  projects/ppc64/sys/   (props changed)
  projects/ppc64/sys/amd64/include/xen/   (props changed)
  projects/ppc64/sys/cddl/contrib/opensolaris/   (props changed)
  projects/ppc64/sys/contrib/dev/acpica/   (props changed)
  projects/ppc64/sys/contrib/x86emu/   (props changed)
  projects/ppc64/sys/dev/xen/xenpci/   (props changed)
  projects/ppc64/usr.bin/csup/   (props changed)
  projects/ppc64/usr.bin/procstat/   (props changed)

Modified: projects/ppc64/Makefile
==============================================================================
--- projects/ppc64/Makefile	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/Makefile	Mon Jun 14 17:28:32 2010	(r209167)
@@ -89,7 +89,8 @@ TGTS=	all all-man buildenv buildenvvars 
 	obj objlink regress rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
-	build32 distribute32 install32 xdev xdev-build xdev-install
+	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
+
 TGTS+=	${SUBDIR_TARGETS}
 
 BITGTS=	files includes

Modified: projects/ppc64/Makefile.inc1
==============================================================================
--- projects/ppc64/Makefile.inc1	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/Makefile.inc1	Mon Jun 14 17:28:32 2010	(r209167)
@@ -982,6 +982,10 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
+.if ${MK_FDT} != "no"
+_dtc= gnu/usr.bin/dtc
+.endif
+
 bootstrap-tools:
 .for _tool in \
     ${_clang_tblgen} \
@@ -990,6 +994,7 @@ bootstrap-tools:
     ${_gperf} \
     ${_groff} \
     ${_ar} \
+    ${_dtc} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     ${_mklocale} \
@@ -1462,3 +1467,39 @@ _xi-links:
 			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
 		done
 .endif
+
+.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
+DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
+
+.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
+FDT_DTS_FILE!=	 grep "^makeoptions[[:space:]]\+FDT_DTS_FILE" \
+	${KERNCONFDIR}/${KERNCONF} 2> /dev/null | cut -d= -f2
+.endif
+
+.endif
+
+.if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
+DTBOUTPUTPATH= ${.CURDIR}
+.endif
+
+#
+# Build 'standalone' Device Tree Blob
+#
+builddtb:
+	@if [ "${FDT_DTS_FILE}" = "" ]; then \
+		echo "ERROR: FDT_DTS_FILE must be specified!"; \
+		exit 1; \
+	fi;	\
+	if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
+		echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
+			exist!"; \
+		exit 1;	\
+	fi;	\
+	if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then	\
+		echo "WARNING: DTB will be placed in the current working \
+			directory"; \
+	fi
+	@PATH=${TMPPATH} \
+	dtc -O dtb -o \
+	    ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
+	    -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}

Modified: projects/ppc64/bin/getfacl/getfacl.1
==============================================================================
--- projects/ppc64/bin/getfacl/getfacl.1	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/bin/getfacl/getfacl.1	Mon Jun 14 17:28:32 2010	(r209167)
@@ -48,7 +48,7 @@ the specified file(s) to standard output
 If the
 .Xr getconf 1
 utility indicates that
-.Eq { } Va _POSIX_ACL_EXTENDED
+.Brq Va _POSIX_ACL_EXTENDED
 is not in effect for a
 .Ar file
 then the standard discretionary access permissions are interpreted as

Modified: projects/ppc64/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
==============================================================================
--- projects/ppc64/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l	Mon Jun 14 17:28:32 2010	(r209167)
@@ -811,7 +811,8 @@ id_or_type(const char *s)
 			longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
 	}
 
-	unput(c0);
+	if (c0 != EOF)
+		unput(c0);
 	return (ttok);
 }
 

Modified: projects/ppc64/contrib/llvm/tools/clang/lib/Basic/Version.cpp
==============================================================================
--- projects/ppc64/contrib/llvm/tools/clang/lib/Basic/Version.cpp	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/contrib/llvm/tools/clang/lib/Basic/Version.cpp	Mon Jun 14 17:28:32 2010	(r209167)
@@ -70,6 +70,9 @@ std::string getClangFullVersion() {
 #endif
   OS << "clang version " CLANG_VERSION_STRING " ("
      << getClangFullRepositoryVersion() << ')';
+#ifdef CLANG_VENDOR_SUFFIX
+  OS << CLANG_VENDOR_SUFFIX;
+#endif
   return OS.str();
 }
 

Modified: projects/ppc64/contrib/wpa/hostapd/ChangeLog
==============================================================================
--- projects/ppc64/contrib/wpa/hostapd/ChangeLog	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/contrib/wpa/hostapd/ChangeLog	Mon Jun 14 17:28:32 2010	(r209167)
@@ -1,5 +1,37 @@
 ChangeLog for hostapd
 
+2010-01-12 - v0.6.10
+	* fixed SHA-256 based key derivation function to match with the
+	  standard when using CCMP (for IEEE 802.11r and IEEE 802.11w)
+	  (note: this breaks interoperability with previous version) [Bug 307]
+	* fixed WPS selected registrar expiration for internal PIN registrar
+	* disable PMTU discovery for RADIUS packets
+	* fixed WPS UPnP SSDP on 32-bit targets
+	* fixed WPS AP reconfiguration with drivers that do not use hostapd
+	  MLME
+	* fixed RSN parameter setting for multi-BSS case
+	* added WPS workarounds for known interoperability issues with broken,
+	  deployed implementation
+	* update IEEE 802.11w implementation to match with the published
+	  standard
+	* fixed OpCode when proxying WSC_ACK or WSC_NACK from WPS ER
+	* fixed proxying of WSC_NACK to WPS ER
+	* fixed compilation with newer GnuTLS versions
+	* added support for defining timeout for WPS PINs
+	* fixed WPS Probe Request processing to handle missing required
+	  attribute
+	* fixed PKCS#12 use with OpenSSL 1.0.0
+
+2009-03-23 - v0.6.9
+	* driver_nl80211: fixed STA accounting data collection (TX/RX bytes
+	  reported correctly; TX/RX packets not yet available from kernel)
+	* fixed EAPOL/EAP reauthentication when using an external RADIUS
+	  authentication server
+	* driver_prism54: fixed segmentation fault on initialization
+	* fixed TNC with EAP-TTLS
+	* fixed IEEE 802.11r key derivation function to match with the standard
+	  (note: this breaks interoperability with previous version) [Bug 303]
+
 2009-02-15 - v0.6.8
 	* increased hostapd_cli ping interval to 5 seconds and made this
 	  configurable with a new command line options (-G<seconds>)

Copied: projects/ppc64/contrib/wpa/hostapd/Makefile (from r209166, head/contrib/wpa/hostapd/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ppc64/contrib/wpa/hostapd/Makefile	Mon Jun 14 17:28:32 2010	(r209167, copy of r209166, head/contrib/wpa/hostapd/Makefile)
@@ -0,0 +1,635 @@
+ifndef CC
+CC=gcc
+endif
+
+ifndef CFLAGS
+CFLAGS = -MMD -O2 -Wall -g
+endif
+
+# define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+# a file (undefine it, if you want to save in binary size)
+CFLAGS += -DHOSTAPD_DUMP_STATE
+
+CFLAGS += -I../src
+CFLAGS += -I../src/crypto
+CFLAGS += -I../src/utils
+CFLAGS += -I../src/common
+
+# Uncomment following line and set the path to your kernel tree include
+# directory if your C library does not include all header files.
+# CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include
+
+-include .config
+
+ifndef CONFIG_OS
+ifdef CONFIG_NATIVE_WINDOWS
+CONFIG_OS=win32
+else
+CONFIG_OS=unix
+endif
+endif
+
+ifeq ($(CONFIG_OS), internal)
+CFLAGS += -DOS_NO_C_LIB_DEFINES
+endif
+
+ifdef CONFIG_NATIVE_WINDOWS
+CFLAGS += -DCONFIG_NATIVE_WINDOWS
+LIBS += -lws2_32
+endif
+
+OBJS =	hostapd.o ieee802_1x.o eapol_sm.o \
+	ieee802_11.o config.o ieee802_11_auth.o accounting.o \
+	sta_info.o wpa.o ctrl_iface.o \
+	drivers.o preauth.o pmksa_cache.o beacon.o \
+	hw_features.o wme.o ap_list.o \
+	mlme.o vlan_init.o wpa_auth_ie.o
+
+OBJS += ../src/utils/eloop.o
+OBJS += ../src/utils/common.o
+OBJS += ../src/utils/wpa_debug.o
+OBJS += ../src/utils/wpabuf.o
+OBJS += ../src/utils/os_$(CONFIG_OS).o
+OBJS += ../src/utils/ip_addr.o
+
+OBJS += ../src/common/ieee802_11_common.o
+OBJS += ../src/common/wpa_common.o
+
+OBJS += ../src/radius/radius.o
+OBJS += ../src/radius/radius_client.o
+
+OBJS += ../src/crypto/md5.o
+OBJS += ../src/crypto/rc4.o
+OBJS += ../src/crypto/md4.o
+OBJS += ../src/crypto/sha1.o
+OBJS += ../src/crypto/des.o
+OBJS += ../src/crypto/aes_wrap.o
+OBJS += ../src/crypto/aes.o
+
+HOBJS=../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/hlr_auc_gw/milenage.o ../src/crypto/aes_wrap.o ../src/crypto/aes.o
+
+CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
+
+ifdef CONFIG_IAPP
+CFLAGS += -DCONFIG_IAPP
+OBJS += iapp.o
+endif
+
+ifdef CONFIG_RSN_PREAUTH
+CFLAGS += -DCONFIG_RSN_PREAUTH
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_PEERKEY
+CFLAGS += -DCONFIG_PEERKEY
+OBJS += peerkey.o
+endif
+
+ifdef CONFIG_IEEE80211W
+CFLAGS += -DCONFIG_IEEE80211W
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_IEEE80211R
+CFLAGS += -DCONFIG_IEEE80211R
+OBJS += wpa_ft.o
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_IEEE80211N
+CFLAGS += -DCONFIG_IEEE80211N
+endif
+
+ifdef CONFIG_DRIVER_HOSTAP
+CFLAGS += -DCONFIG_DRIVER_HOSTAP
+OBJS += driver_hostap.o
+endif
+
+ifdef CONFIG_DRIVER_WIRED
+CFLAGS += -DCONFIG_DRIVER_WIRED
+OBJS += driver_wired.o
+endif
+
+ifdef CONFIG_DRIVER_MADWIFI
+CFLAGS += -DCONFIG_DRIVER_MADWIFI
+OBJS += driver_madwifi.o
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_DRIVER_ATHEROS
+CFLAGS += -DCONFIG_DRIVER_ATHEROS
+OBJS += driver_atheros.o
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_DRIVER_PRISM54
+CFLAGS += -DCONFIG_DRIVER_PRISM54
+OBJS += driver_prism54.o
+endif
+
+ifdef CONFIG_DRIVER_NL80211
+CFLAGS += -DCONFIG_DRIVER_NL80211
+OBJS += driver_nl80211.o radiotap.o
+LIBS += -lnl
+ifdef CONFIG_LIBNL20
+LIBS += -lnl-genl
+CFLAGS += -DCONFIG_LIBNL20
+endif
+endif
+
+ifdef CONFIG_DRIVER_BSD
+CFLAGS += -DCONFIG_DRIVER_BSD
+OBJS += driver_bsd.o
+CONFIG_L2_PACKET=y
+CONFIG_DNET_PCAP=y
+CONFIG_L2_FREEBSD=y
+endif
+
+ifdef CONFIG_DRIVER_TEST
+CFLAGS += -DCONFIG_DRIVER_TEST
+OBJS += driver_test.o
+endif
+
+ifdef CONFIG_DRIVER_NONE
+CFLAGS += -DCONFIG_DRIVER_NONE
+OBJS += driver_none.o
+endif
+
+ifdef CONFIG_L2_PACKET
+ifdef CONFIG_DNET_PCAP
+ifdef CONFIG_L2_FREEBSD
+LIBS += -lpcap
+OBJS += ../src/l2_packet/l2_packet_freebsd.o
+else
+LIBS += -ldnet -lpcap
+OBJS += ../src/l2_packet/l2_packet_pcap.o
+endif
+else
+OBJS += ../src/l2_packet/l2_packet_linux.o
+endif
+else
+OBJS += ../src/l2_packet/l2_packet_none.o
+endif
+
+
+ifdef CONFIG_EAP_MD5
+CFLAGS += -DEAP_MD5
+OBJS += ../src/eap_server/eap_md5.o
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_TLS
+CFLAGS += -DEAP_TLS
+OBJS += ../src/eap_server/eap_tls.o
+TLS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_PEAP
+CFLAGS += -DEAP_PEAP
+OBJS += ../src/eap_server/eap_peap.o
+OBJS += ../src/eap_common/eap_peap_common.o
+TLS_FUNCS=y
+CONFIG_EAP_MSCHAPV2=y
+endif
+
+ifdef CONFIG_EAP_TTLS
+CFLAGS += -DEAP_TTLS
+OBJS += ../src/eap_server/eap_ttls.o
+TLS_FUNCS=y
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_MSCHAPV2
+CFLAGS += -DEAP_MSCHAPv2
+OBJS += ../src/eap_server/eap_mschapv2.o
+MS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_GTC
+CFLAGS += -DEAP_GTC
+OBJS += ../src/eap_server/eap_gtc.o
+endif
+
+ifdef CONFIG_EAP_SIM
+CFLAGS += -DEAP_SIM
+OBJS += ../src/eap_server/eap_sim.o
+CONFIG_EAP_SIM_COMMON=y
+endif
+
+ifdef CONFIG_EAP_AKA
+CFLAGS += -DEAP_AKA
+OBJS += ../src/eap_server/eap_aka.o
+CONFIG_EAP_SIM_COMMON=y
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_EAP_AKA_PRIME
+CFLAGS += -DEAP_AKA_PRIME
+endif
+
+ifdef CONFIG_EAP_SIM_COMMON
+OBJS += ../src/eap_common/eap_sim_common.o
+# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be
+# replaced with another file implementating the interface specified in
+# eap_sim_db.h.
+OBJS += ../src/eap_server/eap_sim_db.o
+NEED_FIPS186_2_PRF=y
+endif
+
+ifdef CONFIG_EAP_PAX
+CFLAGS += -DEAP_PAX
+OBJS += ../src/eap_server/eap_pax.o ../src/eap_common/eap_pax_common.o
+endif
+
+ifdef CONFIG_EAP_PSK
+CFLAGS += -DEAP_PSK
+OBJS += ../src/eap_server/eap_psk.o ../src/eap_common/eap_psk_common.o
+endif
+
+ifdef CONFIG_EAP_SAKE
+CFLAGS += -DEAP_SAKE
+OBJS += ../src/eap_server/eap_sake.o ../src/eap_common/eap_sake_common.o
+endif
+
+ifdef CONFIG_EAP_GPSK
+CFLAGS += -DEAP_GPSK
+OBJS += ../src/eap_server/eap_gpsk.o ../src/eap_common/eap_gpsk_common.o
+ifdef CONFIG_EAP_GPSK_SHA256
+CFLAGS += -DEAP_GPSK_SHA256
+endif
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_EAP_VENDOR_TEST
+CFLAGS += -DEAP_VENDOR_TEST
+OBJS += ../src/eap_server/eap_vendor_test.o
+endif
+
+ifdef CONFIG_EAP_FAST
+CFLAGS += -DEAP_FAST
+OBJS += ../src/eap_server/eap_fast.o
+OBJS += ../src/eap_common/eap_fast_common.o
+TLS_FUNCS=y
+NEED_T_PRF=y
+endif
+
+ifdef CONFIG_WPS
+CFLAGS += -DCONFIG_WPS -DEAP_WSC
+OBJS += ../src/utils/uuid.o
+OBJS += wps_hostapd.o
+OBJS += ../src/eap_server/eap_wsc.o ../src/eap_common/eap_wsc_common.o
+OBJS += ../src/wps/wps.o
+OBJS += ../src/wps/wps_common.o
+OBJS += ../src/wps/wps_attr_parse.o
+OBJS += ../src/wps/wps_attr_build.o
+OBJS += ../src/wps/wps_attr_process.o
+OBJS += ../src/wps/wps_dev_attr.o
+OBJS += ../src/wps/wps_enrollee.o
+OBJS += ../src/wps/wps_registrar.o
+NEED_DH_GROUPS=y
+NEED_SHA256=y
+NEED_CRYPTO=y
+NEED_BASE64=y
+
+ifdef CONFIG_WPS_UPNP
+CFLAGS += -DCONFIG_WPS_UPNP
+OBJS += ../src/wps/wps_upnp.o
+OBJS += ../src/wps/wps_upnp_ssdp.o
+OBJS += ../src/wps/wps_upnp_web.o
+OBJS += ../src/wps/wps_upnp_event.o
+OBJS += ../src/wps/httpread.o
+endif
+
+endif
+
+ifdef CONFIG_EAP_IKEV2
+CFLAGS += -DEAP_IKEV2
+OBJS += ../src/eap_server/eap_ikev2.o ../src/eap_server/ikev2.o
+OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
+NEED_DH_GROUPS=y
+NEED_DH_GROUPS_ALL=y
+endif
+
+ifdef CONFIG_EAP_TNC
+CFLAGS += -DEAP_TNC
+OBJS += ../src/eap_server/eap_tnc.o
+OBJS += ../src/eap_server/tncs.o
+NEED_BASE64=y
+ifndef CONFIG_DRIVER_BSD
+LIBS += -ldl
+endif
+endif
+
+# Basic EAP functionality is needed for EAPOL
+OBJS += ../src/eap_server/eap.o
+OBJS += ../src/eap_common/eap_common.o
+OBJS += ../src/eap_server/eap_methods.o
+OBJS += ../src/eap_server/eap_identity.o
+
+ifdef CONFIG_EAP
+CFLAGS += -DEAP_SERVER
+endif
+
+ifndef CONFIG_TLS
+CONFIG_TLS=openssl
+endif
+
+ifeq ($(CONFIG_TLS), internal)
+ifndef CONFIG_CRYPTO
+CONFIG_CRYPTO=internal
+endif
+endif
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+CFLAGS += -DCONFIG_INTERNAL_X509
+endif
+ifeq ($(CONFIG_CRYPTO), internal)
+CFLAGS += -DCONFIG_INTERNAL_X509
+endif
+
+
+ifdef TLS_FUNCS
+# Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS)
+CFLAGS += -DEAP_TLS_FUNCS
+OBJS += ../src/eap_server/eap_tls_common.o
+NEED_TLS_PRF=y
+ifeq ($(CONFIG_TLS), openssl)
+OBJS += ../src/crypto/tls_openssl.o
+LIBS += -lssl -lcrypto
+LIBS_p += -lcrypto
+LIBS_h += -lcrypto
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS += ../src/crypto/tls_gnutls.o
+LIBS += -lgnutls -lgcrypt -lgpg-error
+LIBS_p += -lgcrypt
+LIBS_h += -lgcrypt
+endif
+ifdef CONFIG_GNUTLS_EXTRA
+CFLAGS += -DCONFIG_GNUTLS_EXTRA
+LIBS += -lgnutls-extra
+endif
+ifeq ($(CONFIG_TLS), internal)
+OBJS += ../src/crypto/tls_internal.o
+OBJS += ../src/tls/tlsv1_common.o ../src/tls/tlsv1_record.o
+OBJS += ../src/tls/tlsv1_cred.o ../src/tls/tlsv1_server.o
+OBJS += ../src/tls/tlsv1_server_write.o ../src/tls/tlsv1_server_read.o
+OBJS += ../src/tls/asn1.o ../src/tls/x509v3.o
+OBJS_p += ../src/tls/asn1.o
+OBJS_p += ../src/crypto/rc4.o ../src/crypto/aes_wrap.o ../src/crypto/aes.o
+NEED_BASE64=y
+CFLAGS += -DCONFIG_TLS_INTERNAL
+CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
+ifeq ($(CONFIG_CRYPTO), internal)
+ifdef CONFIG_INTERNAL_LIBTOMMATH
+CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+else
+LIBS += -ltommath
+LIBS_p += -ltommath
+endif
+endif
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+LIBS += -ltomcrypt -ltfm
+LIBS_p += -ltomcrypt -ltfm
+endif
+endif
+NEED_CRYPTO=y
+else
+OBJS += ../src/crypto/tls_none.o
+endif
+
+ifdef CONFIG_PKCS12
+CFLAGS += -DPKCS12_FUNCS
+endif
+
+ifdef MS_FUNCS
+OBJS += ../src/crypto/ms_funcs.o
+NEED_CRYPTO=y
+endif
+
+ifdef CHAP
+OBJS += ../src/eap_common/chap.o
+endif
+
+ifdef NEED_CRYPTO
+ifndef TLS_FUNCS
+ifeq ($(CONFIG_TLS), openssl)
+LIBS += -lcrypto
+LIBS_p += -lcrypto
+LIBS_h += -lcrypto
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+LIBS += -lgcrypt
+LIBS_p += -lgcrypt
+LIBS_h += -lgcrypt
+endif
+ifeq ($(CONFIG_TLS), internal)
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+LIBS += -ltomcrypt -ltfm
+LIBS_p += -ltomcrypt -ltfm
+endif
+endif
+endif
+ifeq ($(CONFIG_TLS), openssl)
+OBJS += ../src/crypto/crypto_openssl.o
+OBJS_p += ../src/crypto/crypto_openssl.o
+HOBJS += ../src/crypto/crypto_openssl.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS += ../src/crypto/crypto_gnutls.o
+OBJS_p += ../src/crypto/crypto_gnutls.o
+HOBJS += ../src/crypto/crypto_gnutls.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_TLS), internal)
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+OBJS += ../src/crypto/crypto_libtomcrypt.o
+OBJS_p += ../src/crypto/crypto_libtomcrypt.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_CRYPTO), internal)
+OBJS += ../src/crypto/crypto_internal.o ../src/tls/rsa.o ../src/tls/bignum.o
+OBJS_p += ../src/crypto/crypto_internal.o ../src/tls/rsa.o ../src/tls/bignum.o
+CFLAGS += -DCONFIG_CRYPTO_INTERNAL
+ifdef CONFIG_INTERNAL_LIBTOMMATH
+CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST
+CFLAGS += -DLTM_FAST
+endif
+else
+LIBS += -ltommath
+LIBS_p += -ltommath
+endif
+CONFIG_INTERNAL_AES=y
+CONFIG_INTERNAL_DES=y
+CONFIG_INTERNAL_SHA1=y
+CONFIG_INTERNAL_MD4=y
+CONFIG_INTERNAL_MD5=y
+CONFIG_INTERNAL_SHA256=y
+endif
+endif
+else
+CONFIG_INTERNAL_AES=y
+CONFIG_INTERNAL_SHA1=y
+CONFIG_INTERNAL_MD5=y
+CONFIG_INTERNAL_SHA256=y
+endif
+
+ifdef CONFIG_INTERNAL_AES
+CFLAGS += -DINTERNAL_AES
+endif
+ifdef CONFIG_INTERNAL_SHA1
+CFLAGS += -DINTERNAL_SHA1
+endif
+ifdef CONFIG_INTERNAL_SHA256
+CFLAGS += -DINTERNAL_SHA256
+endif
+ifdef CONFIG_INTERNAL_MD5
+CFLAGS += -DINTERNAL_MD5
+endif
+ifdef CONFIG_INTERNAL_MD4
+CFLAGS += -DINTERNAL_MD4
+endif
+ifdef CONFIG_INTERNAL_DES
+CFLAGS += -DINTERNAL_DES
+endif
+
+ifdef NEED_SHA256
+OBJS += ../src/crypto/sha256.o
+endif
+
+ifdef NEED_DH_GROUPS
+OBJS += ../src/crypto/dh_groups.o
+ifdef NEED_DH_GROUPS_ALL
+CFLAGS += -DALL_DH_GROUPS
+endif
+endif
+
+ifndef NEED_FIPS186_2_PRF
+CFLAGS += -DCONFIG_NO_FIPS186_2_PRF
+endif
+
+ifndef NEED_T_PRF
+CFLAGS += -DCONFIG_NO_T_PRF
+endif
+
+ifndef NEED_TLS_PRF
+CFLAGS += -DCONFIG_NO_TLS_PRF
+endif
+
+ifdef CONFIG_RADIUS_SERVER
+CFLAGS += -DRADIUS_SERVER
+OBJS += ../src/radius/radius_server.o
+endif
+
+ifdef CONFIG_IPV6
+CFLAGS += -DCONFIG_IPV6
+endif
+
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
+ifdef CONFIG_FULL_DYNAMIC_VLAN
+# define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
+# and vlan interfaces for the vlan feature.
+CFLAGS += -DCONFIG_FULL_DYNAMIC_VLAN
+endif
+
+ifdef NEED_BASE64
+OBJS += ../src/utils/base64.o
+endif
+
+ifdef CONFIG_NO_STDOUT_DEBUG
+CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
+endif
+
+ifdef CONFIG_NO_AES_EXTRAS
+CFLAGS += -DCONFIG_NO_AES_UNWRAP
+CFLAGS += -DCONFIG_NO_AES_CTR -DCONFIG_NO_AES_OMAC1
+CFLAGS += -DCONFIG_NO_AES_EAX -DCONFIG_NO_AES_CBC
+CFLAGS += -DCONFIG_NO_AES_DECRYPT
+CFLAGS += -DCONFIG_NO_AES_ENCRYPT_BLOCK
+endif
+
+ALL=hostapd hostapd_cli
+
+all: verify_config $(ALL)
+
+Q=@
+E=echo
+ifeq ($(V), 1)
+Q=
+E=true
+endif
+
+%.o: %.c
+	$(Q)$(CC) -c -o $@ $(CFLAGS) $<
+	@$(E) "  CC " $<
+
+verify_config:
+	@if [ ! -r .config ]; then \
+		echo 'Building hostapd requires a configuration file'; \
+		echo '(.config). See README for more instructions. You can'; \
+		echo 'run "cp defconfig .config" to create an example'; \
+		echo 'configuration.'; \
+		exit 1; \
+	fi
+
+install: all
+	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
+
+hostapd: $(OBJS)
+	$(CC) -o hostapd $(OBJS) $(LIBS)
+
+OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+hostapd_cli: $(OBJS_c)
+	$(CC) -o hostapd_cli $(OBJS_c)
+
+NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o ../src/crypto/sha1.o ../src/crypto/rc4.o ../src/crypto/md5.o
+NOBJS += ../src/crypto/crypto_openssl.o ../src/utils/os_$(CONFIG_OS).o
+ifdef TLS_FUNCS
+LIBS_n += -lcrypto
+endif
+
+nt_password_hash: $(NOBJS)
+	$(CC) -o nt_password_hash $(NOBJS) $(LIBS_n)
+
+hlr_auc_gw: $(HOBJS)
+	$(CC) -o hlr_auc_gw $(HOBJS) $(LIBS_h)
+
+clean:
+	$(MAKE) -C ../src clean
+	rm -f core *~ *.o hostapd hostapd_cli nt_password_hash hlr_auc_gw
+	rm -f *.d
+
+%.eps: %.fig
+	fig2dev -L eps $*.fig $*.eps
+
+%.png: %.fig
+	fig2dev -L png -m 3 $*.fig | pngtopnm | pnmscale 0.4 | pnmtopng \
+		> $*.png
+
+docs-pics: doc/hostapd.png doc/hostapd.eps
+
+docs: docs-pics
+	(cd ..; doxygen hostapd/doc/doxygen.full; cd hostapd)
+	$(MAKE) -C doc/latex
+	cp doc/latex/refman.pdf hostapd-devel.pdf
+
+docs-fast: docs-pics
+	(cd ..; doxygen hostapd/doc/doxygen.fast; cd hostapd)
+
+clean-docs:
+	rm -rf doc/latex doc/html
+	rm -f doc/hostapd.{eps,png} hostapd-devel.pdf
+
+TEST_SRC_MILENAGE = ../src/hlr_auc_gw/milenage.c ../src/crypto/aes_wrap.c ../src/crypto/aes.c ../src/utils/common.c ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).c
+test-milenage: $(TEST_SRC_MILENAGE)
+	$(CC) -o test-milenage -Wall -Werror $(TEST_SRC_MILENAGE) \
+		-DTEST_MAIN_MILENAGE -I. -DINTERNAL_AES \
+		-I../src/crypto -I../src/utils
+	./test-milenage
+	rm test-milenage
+
+-include $(OBJS:%.o=%.d)

Modified: projects/ppc64/contrib/wpa/hostapd/README-WPS
==============================================================================
--- projects/ppc64/contrib/wpa/hostapd/README-WPS	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/contrib/wpa/hostapd/README-WPS	Mon Jun 14 17:28:32 2010	(r209167)
@@ -165,10 +165,17 @@ Example command to add a PIN (12345670) 
 hostapd_cli wps_pin 53b63a98-d29e-4457-a2ed-094d7e6a669c 12345670
 
 If the UUID-E is not available (e.g., Enrollee waits for the Registrar
-to be selected before connecting), wildcard UUID may be used to allow the PIN to be used once with any UUID:
+to be selected before connecting), wildcard UUID may be used to allow
+the PIN to be used once with any UUID:
 
 hostapd_cli wps_pin any 12345670
 
+To reduce likelihood of PIN being used with other devices or of
+forgetting an active PIN available for potential attackers, expiration
+time can be set for the new PIN:
+
+hostapd_cli wps_pin any 12345670 300
+
 
 After this, the Enrollee can connect to the AP again and complete WPS
 negotiation. At that point, a new, random WPA PSK is generated for the

Modified: projects/ppc64/contrib/wpa/hostapd/ap.h
==============================================================================
--- projects/ppc64/contrib/wpa/hostapd/ap.h	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/contrib/wpa/hostapd/ap.h	Mon Jun 14 17:28:32 2010	(r209167)
@@ -30,7 +30,7 @@
 #define WLAN_STA_PENDING_POLL BIT(6) /* pending activity poll not ACKed */
 #define WLAN_STA_SHORT_PREAMBLE BIT(7)
 #define WLAN_STA_PREAUTH BIT(8)
-#define WLAN_STA_WME BIT(9)
+#define WLAN_STA_WMM BIT(9)
 #define WLAN_STA_MFP BIT(10)
 #define WLAN_STA_HT BIT(11)
 #define WLAN_STA_WPS BIT(12)

Modified: projects/ppc64/contrib/wpa/hostapd/beacon.c
==============================================================================
--- projects/ppc64/contrib/wpa/hostapd/beacon.c	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/contrib/wpa/hostapd/beacon.c	Mon Jun 14 17:28:32 2010	(r209167)
@@ -298,8 +298,8 @@ void handle_probe_req(struct hostapd_dat
 
 	pos = hostapd_eid_wpa(hapd, pos, epos - pos, sta);
 
-	/* Wi-Fi Wireless Multimedia Extensions */
-	pos = hostapd_eid_wme(hapd, pos);
+	/* Wi-Fi Alliance WMM */
+	pos = hostapd_eid_wmm(hapd, pos);
 
 	pos = hostapd_eid_ht_capabilities_info(hapd, pos);
 	pos = hostapd_eid_ht_operation(hapd, pos);
@@ -395,8 +395,8 @@ void ieee802_11_set_beacon(struct hostap
 	tailpos = hostapd_eid_wpa(hapd, tailpos, tail + BEACON_TAIL_BUF_SIZE -
 				  tailpos, NULL);
 
-	/* Wi-Fi Wireless Multimedia Extensions */
-	tailpos = hostapd_eid_wme(hapd, tailpos);
+	/* Wi-Fi Alliance WMM */
+	tailpos = hostapd_eid_wmm(hapd, tailpos);
 
 #ifdef CONFIG_IEEE80211N
 	if (hapd->iconf->ieee80211n) {

Modified: projects/ppc64/contrib/wpa/hostapd/config.c
==============================================================================
--- projects/ppc64/contrib/wpa/hostapd/config.c	Mon Jun 14 17:13:05 2010	(r209166)
+++ projects/ppc64/contrib/wpa/hostapd/config.c	Mon Jun 14 17:28:32 2010	(r209167)
@@ -201,15 +201,15 @@ static struct hostapd_config * hostapd_c
 	struct hostapd_config *conf;
 	struct hostapd_bss_config *bss;
 	int i;
-	const int aCWmin = 15, aCWmax = 1024;
-	const struct hostapd_wme_ac_params ac_bk =
+	const int aCWmin = 4, aCWmax = 10;
+	const struct hostapd_wmm_ac_params ac_bk =
 		{ aCWmin, aCWmax, 7, 0, 0 }; /* background traffic */
-	const struct hostapd_wme_ac_params ac_be =
+	const struct hostapd_wmm_ac_params ac_be =
 		{ aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */
-	const struct hostapd_wme_ac_params ac_vi = /* video traffic */
-		{ aCWmin >> 1, aCWmin, 2, 3000 / 32, 1 };
-	const struct hostapd_wme_ac_params ac_vo = /* voice traffic */
-		{ aCWmin >> 2, aCWmin >> 1, 2, 1500 / 32, 1 };
+	const struct hostapd_wmm_ac_params ac_vi = /* video traffic */
+		{ aCWmin - 1, aCWmin, 2, 3000 / 32, 1 };
+	const struct hostapd_wmm_ac_params ac_vo = /* voice traffic */
+		{ aCWmin - 2, aCWmin - 1, 2, 1500 / 32, 1 };
 
 	conf = os_zalloc(sizeof(*conf));
 	bss = os_zalloc(sizeof(*bss));
@@ -251,10 +251,10 @@ static struct hostapd_config * hostapd_c
 	for (i = 0; i < NUM_TX_QUEUES; i++)
 		conf->tx_queue[i].aifs = -1; /* use hw default */
 
-	conf->wme_ac_params[0] = ac_be;
-	conf->wme_ac_params[1] = ac_bk;
-	conf->wme_ac_params[2] = ac_vi;
-	conf->wme_ac_params[3] = ac_vo;
+	conf->wmm_ac_params[0] = ac_be;
+	conf->wmm_ac_params[1] = ac_bk;
+	conf->wmm_ac_params[2] = ac_vi;
+	conf->wmm_ac_params[3] = ac_vo;
 
 #ifdef CONFIG_IEEE80211N
 	conf->ht_capab = HT_CAP_INFO_SMPS_DISABLED;
@@ -1166,14 +1166,14 @@ static int hostapd_config_tx_queue(struc
 }
 
 
-static int hostapd_config_wme_ac(struct hostapd_config *conf, char *name,
-				   char *val)
+static int hostapd_config_wmm_ac(struct hostapd_config *conf, char *name,
+				 char *val)
 {
 	int num, v;
 	char *pos;
-	struct hostapd_wme_ac_params *ac;
+	struct hostapd_wmm_ac_params *ac;
 
-	/* skip 'wme_ac_' prefix */
+	/* skip 'wme_ac_' or 'wmm_ac_' prefix */
 	pos = name + 7;
 	if (os_strncmp(pos, "be_", 3) == 0) {
 		num = 0;
@@ -1188,11 +1188,11 @@ static int hostapd_config_wme_ac(struct 
 		num = 3;
 		pos += 3;
 	} else {
-		wpa_printf(MSG_ERROR, "Unknown wme name '%s'", pos);
+		wpa_printf(MSG_ERROR, "Unknown WMM name '%s'", pos);
 		return -1;
 	}
 
-	ac = &conf->wme_ac_params[num];
+	ac = &conf->wmm_ac_params[num];
 
 	if (os_strcmp(pos, "aifs") == 0) {
 		v = atoi(val);
@@ -1221,7 +1221,7 @@ static int hostapd_config_wme_ac(struct 
 			wpa_printf(MSG_ERROR, "Invalid txop value %d", v);
 			return -1;
 		}
-		ac->txopLimit = v;
+		ac->txop_limit = v;
 	} else if (os_strcmp(pos, "acm") == 0) {
 		v = atoi(val);
 		if (v < 0 || v > 1) {
@@ -1230,7 +1230,7 @@ static int hostapd_config_wme_ac(struct 
 		}
 		ac->admission_control_mandatory = v;
 	} else {
-		wpa_printf(MSG_ERROR, "Unknown wme_ac_ field '%s'", pos);
+		wpa_printf(MSG_ERROR, "Unknown wmm_ac_ field '%s'", pos);
 		return -1;
 	}
 
@@ -1452,13 +1452,13 @@ struct hostapd_config * hostapd_config_r
 		} else if (os_strcmp(buf, "bridge") == 0) {
 			os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
 		} else if (os_strcmp(buf, "driver") == 0) {
-			int i;
+			int j;
 			/* clear to get error below if setting is invalid */
 			conf->driver = NULL;
-			for (i = 0; hostapd_drivers[i]; i++) {
-				if (os_strcmp(pos, hostapd_drivers[i]->name) ==
+			for (j = 0; hostapd_drivers[j]; j++) {
+				if (os_strcmp(pos, hostapd_drivers[j]->name) ==
 				    0) {
-					conf->driver = hostapd_drivers[i];
+					conf->driver = hostapd_drivers[j];
 					break;
 				}
 			}
@@ -2070,11 +2070,13 @@ struct hostapd_config * hostapd_config_r
 					   "queue item", line);
 				errors++;
 			}
-		} else if (os_strcmp(buf, "wme_enabled") == 0) {
-			bss->wme_enabled = atoi(pos);
-		} else if (os_strncmp(buf, "wme_ac_", 7) == 0) {
-			if (hostapd_config_wme_ac(conf, buf, pos)) {
-				wpa_printf(MSG_ERROR, "Line %d: invalid wme "
+		} else if (os_strcmp(buf, "wme_enabled") == 0 ||
+			   os_strcmp(buf, "wmm_enabled") == 0) {
+			bss->wmm_enabled = atoi(pos);
+		} else if (os_strncmp(buf, "wme_ac_", 7) == 0 ||
+			   os_strncmp(buf, "wmm_ac_", 7) == 0) {
+			if (hostapd_config_wmm_ac(conf, buf, pos)) {
+				wpa_printf(MSG_ERROR, "Line %d: invalid WMM "
 					   "ac item", line);
 				errors++;
 			}
@@ -2255,29 +2257,30 @@ struct hostapd_config * hostapd_config_r
 
 	fclose(f);
 
-	if (bss->individual_wep_key_len == 0) {
-		/* individual keys are not use; can use key idx0 for broadcast
-		 * keys */
-		bss->broadcast_key_idx_min = 0;
-	}
-
-	/* Select group cipher based on the enabled pairwise cipher suites */
-	pairwise = 0;
-	if (bss->wpa & 1)
-		pairwise |= bss->wpa_pairwise;
-	if (bss->wpa & 2) {
-		if (bss->rsn_pairwise == 0)
-			bss->rsn_pairwise = bss->wpa_pairwise;
-		pairwise |= bss->rsn_pairwise;
-	}
-	if (pairwise & WPA_CIPHER_TKIP)
-		bss->wpa_group = WPA_CIPHER_TKIP;
-	else
-		bss->wpa_group = WPA_CIPHER_CCMP;
-
 	for (i = 0; i < conf->num_bss; i++) {
 		bss = &conf->bss[i];
 
+		if (bss->individual_wep_key_len == 0) {
+			/* individual keys are not use; can use key idx0 for
+			 * broadcast keys */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list