PERFORCE change 140338 for review
Marcel Moolenaar
marcel at FreeBSD.org
Mon Apr 21 00:16:16 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140338
Change 140338 by marcel at marcel_xcllnt on 2008/04/21 00:15:32
IFC @140337
Affected files ...
.. //depot/projects/powerpc/ObsoleteFiles.inc#20 integrate
.. //depot/projects/powerpc/UPDATING#19 integrate
.. //depot/projects/powerpc/contrib/hostapd/driver_wired.c#3 delete
.. //depot/projects/powerpc/etc/Makefile#6 integrate
.. //depot/projects/powerpc/etc/defaults/rc.conf#13 integrate
.. //depot/projects/powerpc/etc/network.subr#7 integrate
.. //depot/projects/powerpc/etc/rc.d/hostapd#3 integrate
.. //depot/projects/powerpc/etc/rc.d/netif#7 integrate
.. //depot/projects/powerpc/etc/rc.d/wpa_supplicant#3 integrate
.. //depot/projects/powerpc/etc/regdomain.xml#1 branch
.. //depot/projects/powerpc/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 integrate
.. //depot/projects/powerpc/include/stdio.h#5 integrate
.. //depot/projects/powerpc/lib/libc/stdio/_flock_stub.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/asprintf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fgetwc.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fgetws.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/findfp.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fputwc.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fputws.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/freopen.c#4 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fseek.c#4 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fwide.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/local.h#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/refill.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/snprintf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/sprintf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/sscanf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/ungetc.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/ungetwc.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vasprintf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vfprintf.c#4 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vfwprintf.c#4 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vsnprintf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vsprintf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vsscanf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vswprintf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vswscanf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/xprintf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdlib/strfmon.c#3 integrate
.. //depot/projects/powerpc/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/powerpc/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#19 integrate
.. //depot/projects/powerpc/release/doc/share/sgml/release.dsl#2 integrate
.. //depot/projects/powerpc/release/doc/share/sgml/release.ent#6 integrate
.. //depot/projects/powerpc/sbin/ifconfig/Makefile#4 integrate
.. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#14 integrate
.. //depot/projects/powerpc/sbin/ifconfig/ifieee80211.c#8 integrate
.. //depot/projects/powerpc/sbin/ifconfig/ifmedia.c#6 integrate
.. //depot/projects/powerpc/sbin/ifconfig/regdomain.c#1 branch
.. //depot/projects/powerpc/sbin/ifconfig/regdomain.h#1 branch
.. //depot/projects/powerpc/share/man/man4/Makefile#21 integrate
.. //depot/projects/powerpc/share/man/man4/altq.4#6 integrate
.. //depot/projects/powerpc/share/man/man4/ath.4#5 integrate
.. //depot/projects/powerpc/share/man/man4/awi.4#4 delete
.. //depot/projects/powerpc/share/man/man4/cnw.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/ipw.4#5 integrate
.. //depot/projects/powerpc/share/man/man4/iwi.4#5 integrate
.. //depot/projects/powerpc/share/man/man4/malo.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/ral.4#4 integrate
.. //depot/projects/powerpc/share/man/man4/rum.4#4 integrate
.. //depot/projects/powerpc/share/man/man4/ural.4#6 integrate
.. //depot/projects/powerpc/share/man/man4/wi.4#6 integrate
.. //depot/projects/powerpc/share/man/man4/wlan.4#4 integrate
.. //depot/projects/powerpc/share/man/man4/wlan_acl.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/wlan_amrr.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/wlan_xauth.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/wpi.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/zyd.4#2 integrate
.. //depot/projects/powerpc/share/man/man5/Makefile#5 integrate
.. //depot/projects/powerpc/share/man/man5/regdomain.5#1 branch
.. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#14 integrate
.. //depot/projects/powerpc/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/powerpc/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/powerpc/sys/arm/arm/intr.c#9 integrate
.. //depot/projects/powerpc/sys/arm/at91/at91.c#5 integrate
.. //depot/projects/powerpc/sys/arm/conf/AVILA#9 integrate
.. //depot/projects/powerpc/sys/arm/conf/HL200#3 integrate
.. //depot/projects/powerpc/sys/arm/conf/KB920X#6 integrate
.. //depot/projects/powerpc/sys/arm/include/intr.h#4 integrate
.. //depot/projects/powerpc/sys/conf/NOTES#25 integrate
.. //depot/projects/powerpc/sys/conf/files#29 integrate
.. //depot/projects/powerpc/sys/conf/files.pc98#12 integrate
.. //depot/projects/powerpc/sys/conf/options#27 integrate
.. //depot/projects/powerpc/sys/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/powerpc/sys/contrib/pf/net/pf.c#8 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-all.c#11 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-all.h#14 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#12 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-disk.c#12 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-dma.c#10 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-lowlevel.c#6 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-pci.c#10 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-queue.c#6 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-raid.c#9 integrate
.. //depot/projects/powerpc/sys/dev/ata/atapi-cam.c#7 integrate
.. //depot/projects/powerpc/sys/dev/ata/atapi-cd.c#10 integrate
.. //depot/projects/powerpc/sys/dev/ata/atapi-fd.c#8 integrate
.. //depot/projects/powerpc/sys/dev/ata/atapi-tape.c#9 integrate
.. //depot/projects/powerpc/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/powerpc/sys/dev/ath/ah_osdep.h#3 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/amrr/amrr.h#2 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/onoe/onoe.c#5 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/onoe/onoe.h#3 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/sample/sample.c#6 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/sample/sample.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_ath_pci.c#6 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_athioctl.h#3 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_athrate.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_athvar.h#6 integrate
.. //depot/projects/powerpc/sys/dev/awi/am79c930.c#4 delete
.. //depot/projects/powerpc/sys/dev/awi/am79c930reg.h#4 delete
.. //depot/projects/powerpc/sys/dev/awi/am79c930var.h#4 delete
.. //depot/projects/powerpc/sys/dev/awi/awi.c#7 delete
.. //depot/projects/powerpc/sys/dev/awi/awireg.h#4 delete
.. //depot/projects/powerpc/sys/dev/awi/awivar.h#6 delete
.. //depot/projects/powerpc/sys/dev/awi/if_awi_pccard.c#5 delete
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_l2t.c#6 delete
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_l2t.h#5 delete
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_main.c#16 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_offload.c#6 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_offload.h#7 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#7 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate
.. //depot/projects/powerpc/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/powerpc/sys/dev/if_ndis/if_ndisvar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ipw/if_ipw.c#7 integrate
.. //depot/projects/powerpc/sys/dev/ipw/if_ipwvar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/powerpc/sys/dev/iwi/if_iwi.c#7 integrate
.. //depot/projects/powerpc/sys/dev/iwi/if_iwivar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/powerpc/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/powerpc/sys/dev/ral/if_ral_pci.c#4 integrate
.. //depot/projects/powerpc/sys/dev/ral/if_ralrate.c#2 delete
.. //depot/projects/powerpc/sys/dev/ral/if_ralrate.h#2 delete
.. //depot/projects/powerpc/sys/dev/ral/rt2560.c#9 integrate
.. //depot/projects/powerpc/sys/dev/ral/rt2560reg.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ral/rt2560var.h#5 integrate
.. //depot/projects/powerpc/sys/dev/ral/rt2661.c#8 integrate
.. //depot/projects/powerpc/sys/dev/ral/rt2661_ucode.h#2 delete
.. //depot/projects/powerpc/sys/dev/ral/rt2661var.h#4 integrate
.. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#16 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_rum.c#7 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_rumvar.h#3 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_ural.c#10 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_uralvar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_zyd.c#5 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/powerpc/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/powerpc/sys/dev/usb/usbdevs#22 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wavelan_ieee.h#5 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wi.c#11 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wi_pccard.c#3 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wi_pci.c#3 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wivar.h#5 integrate
.. //depot/projects/powerpc/sys/dev/wi/spectrum24t_cf.h#2 delete
.. //depot/projects/powerpc/sys/dev/wpi/if_wpi.c#6 integrate
.. //depot/projects/powerpc/sys/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/powerpc/sys/i386/conf/GENERIC#18 integrate
.. //depot/projects/powerpc/sys/i386/conf/PAE#6 integrate
.. //depot/projects/powerpc/sys/i386/include/cpufunc.h#5 integrate
.. //depot/projects/powerpc/sys/ia64/ia64/mp_machdep.c#7 integrate
.. //depot/projects/powerpc/sys/ia64/ia64/pmap.c#15 integrate
.. //depot/projects/powerpc/sys/ia64/include/vmparam.h#10 integrate
.. //depot/projects/powerpc/sys/kern/kern_intr.c#17 integrate
.. //depot/projects/powerpc/sys/kern/kern_linker.c#12 integrate
.. //depot/projects/powerpc/sys/kern/kern_subr.c#7 integrate
.. //depot/projects/powerpc/sys/kern/kern_switch.c#14 integrate
.. //depot/projects/powerpc/sys/kern/kern_synch.c#16 integrate
.. //depot/projects/powerpc/sys/kern/kern_thread.c#16 integrate
.. //depot/projects/powerpc/sys/kern/sched_4bsd.c#16 integrate
.. //depot/projects/powerpc/sys/kern/sched_ule.c#19 integrate
.. //depot/projects/powerpc/sys/kern/subr_sleepqueue.c#12 integrate
.. //depot/projects/powerpc/sys/kern/subr_trap.c#13 integrate
.. //depot/projects/powerpc/sys/kern/subr_turnstile.c#8 integrate
.. //depot/projects/powerpc/sys/kern/subr_witness.c#22 integrate
.. //depot/projects/powerpc/sys/mips/conf/IDT#2 integrate
.. //depot/projects/powerpc/sys/modules/Makefile#21 integrate
.. //depot/projects/powerpc/sys/modules/ath_rate_amrr/Makefile#3 integrate
.. //depot/projects/powerpc/sys/modules/ath_rate_onoe/Makefile#3 integrate
.. //depot/projects/powerpc/sys/modules/ath_rate_sample/Makefile#3 integrate
.. //depot/projects/powerpc/sys/modules/awi/Makefile#3 delete
.. //depot/projects/powerpc/sys/modules/cxgb/cxgb/Makefile#6 integrate
.. //depot/projects/powerpc/sys/modules/cxgb/tom/Makefile#4 integrate
.. //depot/projects/powerpc/sys/modules/firmware/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/malo/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/ral/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/ralfw/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/powerpc/sys/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/wlan/Makefile#3 integrate
.. //depot/projects/powerpc/sys/modules/wlan_acl/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_ccmp/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/powerpc/sys/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/powerpc/sys/modules/wlan_tkip/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_wep/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_xauth/Makefile#2 integrate
.. //depot/projects/powerpc/sys/net/if.c#15 integrate
.. //depot/projects/powerpc/sys/net/if_media.h#8 integrate
.. //depot/projects/powerpc/sys/net80211/_ieee80211.h#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211.c#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211.h#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_acl.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_amrr.c#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto.c#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto.h#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_none.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_tkip.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_wep.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_freebsd.c#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_freebsd.h#6 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_ht.c#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_ht.h#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_input.c#8 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_input.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_ioctl.c#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_ioctl.h#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_node.c#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_node.h#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_output.c#8 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_proto.c#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_proto.h#6 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan_ap.c#3 delete
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan_sta.c#6 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_var.h#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_xauth.c#3 integrate
.. //depot/projects/powerpc/sys/netgraph/ng_base.c#19 integrate
.. //depot/projects/powerpc/sys/netinet/in.h#10 integrate
.. //depot/projects/powerpc/sys/netinet/in_mcast.c#3 integrate
.. //depot/projects/powerpc/sys/netinet/in_pcb.c#16 integrate
.. //depot/projects/powerpc/sys/netinet/in_pcb.h#13 integrate
.. //depot/projects/powerpc/sys/netinet/ip_divert.c#9 integrate
.. //depot/projects/powerpc/sys/netinet/ip_fw2.c#17 integrate
.. //depot/projects/powerpc/sys/netinet/ip_icmp.c#9 integrate
.. //depot/projects/powerpc/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/powerpc/sys/netinet/ip_output.c#13 integrate
.. //depot/projects/powerpc/sys/netinet/raw_ip.c#10 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_input.c#17 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_offload.h#3 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_output.c#15 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_reass.c#3 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_sack.c#5 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_subr.c#16 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#17 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_timer.c#10 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_usrreq.c#16 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_var.h#17 integrate
.. //depot/projects/powerpc/sys/netinet/udp_usrreq.c#12 integrate
.. //depot/projects/powerpc/sys/netinet6/icmp6.c#12 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_pcb.c#11 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_src.c#13 integrate
.. //depot/projects/powerpc/sys/netinet6/raw_ip6.c#11 integrate
.. //depot/projects/powerpc/sys/netinet6/udp6_usrreq.c#13 integrate
.. //depot/projects/powerpc/sys/pc98/cbus/clock.c#8 integrate
.. //depot/projects/powerpc/sys/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/powerpc/sys/pc98/conf/GENERIC#14 integrate
.. //depot/projects/powerpc/sys/pc98/include/clock.h#3 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_arg.c#10 integrate
.. //depot/projects/powerpc/sys/security/mac/mac_inet.c#7 integrate
.. //depot/projects/powerpc/sys/sparc64/conf/GENERIC#15 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/apb.c#4 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pci_if.m#4 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcib.c#3 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcibus.c#7 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/psycho.c#10 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/psychovar.h#6 integrate
.. //depot/projects/powerpc/sys/sys/param.h#20 integrate
.. //depot/projects/powerpc/sys/sys/proc.h#24 integrate
.. //depot/projects/powerpc/sys/sys/sched.h#7 integrate
.. //depot/projects/powerpc/sys/sys/sysctl.h#12 integrate
.. //depot/projects/powerpc/sys/sys/termios.h#4 integrate
.. //depot/projects/powerpc/sys/vm/vm_glue.c#13 integrate
.. //depot/projects/powerpc/sys/vm/vm_zeroidle.c#12 integrate
.. //depot/projects/powerpc/tools/tools/net80211/Makefile#3 integrate
.. //depot/projects/powerpc/tools/tools/net80211/scripts/config#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.dfs#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.fixed#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.local#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.mixed#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.simple#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.simple2#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.sta#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.tsn#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.updown#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.updown.wpa#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wds#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wdsmain#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wdsrelay#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wep#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa1.aes#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa1.tkip#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa2#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa2.tkip#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/wlanstats/main.c#4 integrate
.. //depot/projects/powerpc/tools/tools/net80211/wlanstats/wlanstats.c#5 integrate
.. //depot/projects/powerpc/tools/tools/net80211/wlanwds/Makefile#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/wlanwds/wlanwds.c#1 branch
.. //depot/projects/powerpc/usr.bin/env/env.1#2 integrate
.. //depot/projects/powerpc/usr.bin/env/env.c#4 integrate
.. //depot/projects/powerpc/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/powerpc/usr.sbin/wlandebug/wlandebug.c#2 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/hostapd/Makefile#4 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/hostapd/driver_freebsd.c#3 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/wpa_supplicant/Packet32.c#3 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#5 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/wpa_supplicant/driver_wired.c#1 branch
Differences ...
==== //depot/projects/powerpc/ObsoleteFiles.inc#20 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.137 2008/04/20 16:03:19 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -19,6 +19,22 @@
OLD_FILES+=usr/sbin/pkg_sign
OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
+# 20080325: tzdata2008b import
+OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
+OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
+# 20080314: stack_print(9) mlink fixed
+OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
+# 20080312: libkse removal
+OLD_FILES+=usr/include/sys/kse.h
+OLD_FILES+=usr/lib/libkse.so
+OLD_LIBS+=usr/lib/libkse.so.3
+OLD_FILES+=usr/share/man/man2/kse.2.gz
+OLD_FILES+=usr/share/man/man2/kse_create.2.gz
+OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
+OLD_FILES+=usr/share/man/man2/kse_release.2.gz
+OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
+OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
+OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
==== //depot/projects/powerpc/UPDATING#19 (text+ko) ====
@@ -22,6 +22,16 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080420:
+ The 802.11 wireless support was redone to enable multi-bss
+ operation on devices that are capable. The underlying device
+ is no longer used directly but instead wlanX devices are
+ cloned with ifconfig. This requires changes to rc.conf files.
+
+ As part of the multi-bss changes the wlan_scan_ap and wlan_scan_sta
+ modules were merged into the base wlan module. All references
+ to these modules (e.g. in kernel config files) must be removed.
+
20080408:
psm(4) has gained write(2) support in native operation level.
Arbitrary commands can be written to /dev/psm%d and status can
@@ -1014,4 +1024,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $
+$FreeBSD: src/UPDATING,v 1.525 2008/04/20 21:25:37 sam Exp $
==== //depot/projects/powerpc/etc/Makefile#6 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $
+# $FreeBSD: src/etc/Makefile,v 1.367 2008/04/20 20:37:02 sam Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@
portsnap.conf pf.os phones profile protocols \
rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
rc.sendmail rc.shutdown \
- rc.subr remote rpc services shells \
+ rc.subr regdomain.xml remote rpc services shells \
snmpd.config sysctl.conf syslog.conf \
etc.${MACHINE_ARCH}/ttys \
${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
==== //depot/projects/powerpc/etc/defaults/rc.conf#13 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.331 2008/04/20 20:37:20 sam Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -184,6 +184,7 @@
#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
#ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry.
#ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0.
+#vaps_ath0="wlan0" # VAP interfaces for ath0 device
#ipv4_addrs_fxp0="192.168.0.1/24 192.168.1.1-5/28" # example IPv4 address entry.
#
#autobridge_interfaces="bridge0" # List of bridges to check
==== //depot/projects/powerpc/etc/network.subr#7 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.182 2008/03/28 06:50:06 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.183 2008/04/20 20:37:20 sam Exp $
#
#
@@ -30,6 +30,56 @@
# Requires that rc.conf be loaded first.
#
+# ifn_start ifn
+# Bring up and configure an interface. If some configuration is applied
+# print the interface configuration.
+#
+ifn_start()
+{
+ local ifn cfg
+ ifn="$1"
+ cfg=1
+
+ [ -z "$ifn" ] && err 1 "ifn_start called without an interface"
+
+ ifscript_up ${ifn} && cfg=0
+ ifconfig_up ${ifn} && cfg=0
+ ipv4_up ${ifn} && cfg=0
+ ipx_up ${ifn} && cfg=0
+ childif_create ${ifn} && cfg=0
+
+ if [ "$cfg" -eq 0 ]; then
+ ifconfig ${ifn}
+ fi
+
+ return $cfg
+}
+
+# ifn_start ifn
+# Shutdown and de-configure an interface. If action is taken print the
+# interface name.
+#
+ifn_stop()
+{
+ local ifn cfg
+ ifn="$1"
+ cfg=1
+
+ [ -z "$ifn" ] && return 1
+
+ ipx_down ${ifn} && cfg=0
+ ipv4_down ${ifn} && cfg=0
+ ifconfig_down ${ifn} && cfg=0
+ ifscript_down ${ifn} && cfg=0
+ childif_destroy ${ifn} && cfg=0
+
+ if [ "$cfg" -eq 0 ]; then
+ echo -n " ${ifn}"
+ fi
+
+ return $cfg
+}
+
# ifconfig_up if
# Evaluate ifconfig(8) arguments for interface $if and
# run ifconfig(8) with those arguments. It returns 0 if
@@ -43,8 +93,8 @@
ifconfig_args=`ifconfig_getargs $1`
if [ -n "${ifconfig_args}" ]; then
+ ifconfig $1 ${ifconfig_args}
ifconfig $1 up
- ifconfig $1 ${ifconfig_args}
_cfg=0
fi
@@ -452,6 +502,44 @@
debug "Destroyed clones: ${_list}"
}
+# Create and configure child interfaces.
+# Return 0 if child interfaces are created.
+#
+childif_create()
+{
+ local cfg child child_vaps create_args ifn i
+ cfg=1
+
+ ifn=$1
+
+ # Create VAPs
+ child_vaps=`get_if_var $ifn vaps_IF`
+ for child in ${child_vaps}; do
+ create_args="wlandev $ifn `get_if_var $child vap_create_IF`"
+ if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then
+ ifconfig $child create ${create_args} && cfg=0
+ else
+ i=`ifconfig wlan create ${create_args}`
+ ifconfig $i name $child && cfg=0
+ fi
+ ifn_start $child
+ done
+
+ return
+}
+
+# Destroy child interfaces.
+#
+childif_destroy()
+{
+ local cfg child child_vaps ifn
+
+ child_vaps=`get_if_var $ifn vaps_IF`
+ for child in ${child_vaps}; do
+ ifconfig $child destroy && cfg=0
+ done
+}
+
# Create netgraph nodes.
#
ng_mkpeer() {
==== //depot/projects/powerpc/etc/rc.d/hostapd#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/hostapd,v 1.2 2007/11/14 21:19:15 brix Exp $
+# $FreeBSD: src/etc/rc.d/hostapd,v 1.3 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: hostapd
@@ -18,6 +18,7 @@
command_args="-P ${pidfile} -B ${conf_file}"
required_files="${conf_file}"
+required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
extra_commands="reload"
load_rc_config ${name}
==== //depot/projects/powerpc/etc/rc.d/netif#7 (text+ko) ====
@@ -22,7 +22,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.26 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: netif
@@ -68,7 +68,7 @@
fi
# Configure the interface(s).
- network_common ifn_start verbose
+ network_common ifn_start
if [ -f /etc/rc.d/ipfilter ] ; then
# Resync ipfilter
@@ -92,34 +92,31 @@
echo '.'
}
-# network_common routine verbose
+# network_common routine
# Common configuration subroutine for network interfaces. This
# routine takes all the preparatory steps needed for configuriing
-# an interface and then calls $routine. If $verbose is specified,
-# it will call ifconfig(8) to show, in long format, the configured
-# interfaces. If $verbose is not given, it will simply output the
-# configured interface(s).
+# an interface and then calls $routine.
network_common()
{
- local _cooked_list _fail _func _verbose
+ local _cooked_list _fail _func
_func=
- _verbose=
if [ -z "$1" ]; then
err 1 "network_common(): No function name specified."
else
_func="$1"
fi
- [ -n "$2" ] && _verbose=yes
# Set the scope of the command (all interfaces or just one).
#
_cooked_list=
if [ -n "$cmdifn" ]; then
- # Don't check that the interfaces exist. We need to run
+ # Don't check that the interface(s) exist. We need to run
# the down code even when the interface doesn't exist to
# kill off wpa_supplicant.
+ # XXXBED: is this really true or does wpa_supplicant die?
+ # if so, we should get rid of the devd entry
_cooked_list="$cmdifn"
else
_cooked_list="`list_net_interfaces`"
@@ -127,59 +124,13 @@
_fail=
for ifn in ${_cooked_list}; do
- if ${_func} ${ifn} ; then
- eval showstat_$ifn=1
- else
- _fail="$_fail $ifn"
+ if ! ${_func} ${ifn} $2; then
+ _fail="${_fail} ${ifn}"
fi
done
- # Display interfaces configured by this script
- #
- for ifn in ${_cooked_list}; do
- eval showstat=\$showstat_${ifn}
- if [ ! -z ${showstat} ]; then
- if [ -n "$_verbose" ]; then
- ifconfig ${ifn}
- else
- echo -n " ${ifn}"
- fi
- fi
- done
debug "The following interfaces were not configured: $_fail"
}
-ifn_start()
-{
- local ifn cfg
- ifn="$1"
- cfg=1
-
- [ -z "$ifn" ] && return 1
-
- ifscript_up ${ifn} && cfg=0
- ifconfig_up ${ifn} && cfg=0
- ipv4_up ${ifn} && cfg=0
- ipx_up ${ifn} && cfg=0
-
- return $cfg
-}
-
-ifn_stop()
-{
- local ifn cfg
- ifn="$1"
- cfg=1
-
- [ -z "$ifn" ] && return 1
-
- ipx_down ${ifn} && cfg=0
- ipv4_down ${ifn} && cfg=0
- ifconfig_down ${ifn} && cfg=0
- ifscript_down ${ifn} && cfg=0
-
- return $cfg
-}
-
load_rc_config $name
run_rc_command $*
==== //depot/projects/powerpc/etc/rc.d/wpa_supplicant#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.6 2008/04/20 20:37:21 sam Exp $
#
# PROVIDE: wpa_supplicant
@@ -30,18 +30,21 @@
test "$media" = "Ethernet"
}
-case ${ifn} in
-ndis*)
+is_ndis_interface()
+{
+ case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
+ ndis*) true ;;
+ *) false ;;
+ esac
+}
+
+if is_wired_interface ${ifn} ; then
+ driver="wired"
+elif is_ndis_interface ${ifn} ; then
driver="ndis"
- ;;
-*)
- if is_wired_interface ${ifn} ; then
- driver="wired"
- else
- driver="bsd"
- fi
- ;;
-esac
+else
+ driver="bsd"
+fi
load_rc_config $name
@@ -50,5 +53,6 @@
pidfile="/var/run/${name}/${ifn}.pid"
command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
required_files=$conf_file
+required_modules="wlan_wep wlan_tkip wlan_ccmp"
run_rc_command "$1"
==== //depot/projects/powerpc/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 (text+ko) ====
@@ -1,12 +1,19 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.17 2004/07/08 17:05:32 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.18 2008/04/17 23:36:35 marcel Exp $
DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec
-SRCS+= cpu-i386.c \
+SRCS+= cofflink.c \
+ cpu-i386.c \
+ efi-app-ia32.c \
elf32-i386.c \
elf32-target.h \
elf32.c \
- elflink.c
+ elflink.c \
+ peigen.c
VECS= ${DEFAULT_VECTOR} \
- bfd_elf32_i386_vec
+ bfd_elf32_i386_vec \
+ bfd_efi_app_ia32_vec
+
+peigen.c: peXXigen.c
+ sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET}
==== //depot/projects/powerpc/include/stdio.h#5 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)stdio.h 8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.62 2008/03/31 12:14:04 kib Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.64 2008/04/17 22:17:53 jhb Exp $
*/
#ifndef _STDIO_H_
@@ -72,9 +72,6 @@
int _size;
};
-/* hold a buncha junk that would grow the ABI */
-struct __sFILEX;
-
/*
* stdio state variables.
*
@@ -98,15 +95,19 @@
* that does not match the previous one in _bf. When this happens,
* _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
* _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * Certain members of __sFILE are accessed directly via macros or
+ * inline functions. To preserve ABI compat, these members must not
+ * be disturbed. These members are marked below with (*).
*/
typedef struct __sFILE {
- unsigned char *_p; /* current position in (some) buffer */
- int _r; /* read space left for getc() */
- int _w; /* write space left for putc() */
- short _flags; /* flags, below; this FILE is free if 0 */
- short _file; /* fileno, if Unix descriptor, else -1 */
+ unsigned char *_p; /* (*) current position in (some) buffer */
+ int _r; /* (*) read space left for getc() */
+ int _w; /* (*) write space left for putc() */
+ short _flags; /* (*) flags, below; this FILE is free if 0 */
+ short _file; /* (*) fileno, if Unix descriptor, else -1 */
struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */
- int _lbfsize; /* 0 or -_bf._size, for inline putc */
+ int _lbfsize; /* (*) 0 or -_bf._size, for inline putc */
/* operations */
void *_cookie; /* cookie passed to io functions */
@@ -117,7 +118,7 @@
/* separate buffer for long sequences of ungetc() */
struct __sbuf _ub; /* ungetc buffer */
- struct __sFILEX *_extra; /* additions to FILE to not break ABI */
+ unsigned char *_up; /* saved _p when _p is doing ungetc data */
int _ur; /* saved _r when _r is counting ungetc data */
/* tricks to meet minimum requirements even when malloc() fails */
@@ -130,6 +131,12 @@
/* Unix stdio files get aligned to block boundaries on fseek() */
int _blksize; /* stat.st_blksize (may be != _bf._size) */
fpos_t _offset; /* current lseek offset */
+
+ struct pthread_mutex *_fl_mutex; /* used for MT-safety */
+ struct pthread *_fl_owner; /* current owner */
+ int _fl_count; /* recursive lock count */
+ int _orientation; /* orientation for fwide() */
+ __mbstate_t _mbstate; /* multibyte conversion state */
} FILE;
#ifndef _STDSTREAM_DECLARED
==== //depot/projects/powerpc/lib/libc/stdio/_flock_stub.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.15 2007/01/12 07:31:30 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.16 2008/04/17 22:17:53 jhb Exp $");
#include "namespace.h"
#include <stdio.h>
@@ -55,31 +55,21 @@
__weak_reference(_ftrylockfile, ftrylockfile);
__weak_reference(_funlockfile, funlockfile);
-/*
- * We need to retain binary compatibility for a while. So pretend
- * that _lock is part of FILE * even though it is dereferenced off
- * _extra now. When we stop encoding the size of FILE into binaries
- * this can be changed in stdio.h. This will reduce the amount of
- * code that has to change in the future (just remove this comment
- * and #define).
- */
-#define _lock _extra
-
void
_flockfile(FILE *fp)
{
pthread_t curthread = _pthread_self();
- if (fp->_lock->fl_owner == curthread)
- fp->_lock->fl_count++;
+ if (fp->_fl_owner == curthread)
+ fp->_fl_count++;
else {
/*
* Make sure this mutex is treated as a private
* internal mutex:
*/
- _pthread_mutex_lock(&fp->_lock->fl_mutex);
- fp->_lock->fl_owner = curthread;
- fp->_lock->fl_count = 1;
+ _pthread_mutex_lock(&fp->_fl_mutex);
+ fp->_fl_owner = curthread;
+ fp->_fl_count = 1;
}
}
@@ -98,15 +88,15 @@
pthread_t curthread = _pthread_self();
int ret = 0;
- if (fp->_lock->fl_owner == curthread)
- fp->_lock->fl_count++;
+ if (fp->_fl_owner == curthread)
+ fp->_fl_count++;
/*
* Make sure this mutex is treated as a private
* internal mutex:
*/
- else if (_pthread_mutex_trylock(&fp->_lock->fl_mutex) == 0) {
- fp->_lock->fl_owner = curthread;
- fp->_lock->fl_count = 1;
+ else if (_pthread_mutex_trylock(&fp->_fl_mutex) == 0) {
+ fp->_fl_owner = curthread;
+ fp->_fl_count = 1;
}
else
ret = -1;
@@ -121,26 +111,26 @@
/*
* Check if this file is owned by the current thread:
*/
- if (fp->_lock->fl_owner == curthread) {
+ if (fp->_fl_owner == curthread) {
/*
* Check if this thread has locked the FILE
* more than once:
*/
- if (fp->_lock->fl_count > 1)
+ if (fp->_fl_count > 1)
/*
* Decrement the count of the number of
* times the running thread has locked this
* file:
*/
- fp->_lock->fl_count--;
+ fp->_fl_count--;
else {
/*
* The running thread will release the
* lock now:
*/
- fp->_lock->fl_count = 0;
- fp->_lock->fl_owner = NULL;
- _pthread_mutex_unlock(&fp->_lock->fl_mutex);
+ fp->_fl_count = 0;
+ fp->_fl_owner = NULL;
+ _pthread_mutex_unlock(&fp->_fl_mutex);
}
}
}
==== //depot/projects/powerpc/lib/libc/stdio/asprintf.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.13 2002/09/26 13:09:48 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.14 2008/04/17 22:17:53 jhb Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -43,7 +43,6 @@
int ret;
va_list ap;
FILE f;
- struct __sFILEX ext;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list