Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Apr 2008 00:19:18 GMT
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 140339 for review
Message-ID:  <200804210019.m3L0JIlr004023@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140339

Change 140339 by marcel@marcel_xcllnt on 2008/04/21 00:18:51

	IFC @140337

Affected files ...

.. //depot/projects/ia64/ObsoleteFiles.inc#25 integrate
.. //depot/projects/ia64/UPDATING#103 integrate
.. //depot/projects/ia64/contrib/hostapd/driver_wired.c#4 delete
.. //depot/projects/ia64/etc/Makefile#60 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#82 integrate
.. //depot/projects/ia64/etc/network.subr#23 integrate
.. //depot/projects/ia64/etc/rc.d/hostapd#3 integrate
.. //depot/projects/ia64/etc/rc.d/netif#19 integrate
.. //depot/projects/ia64/etc/rc.d/wpa_supplicant#4 integrate
.. //depot/projects/ia64/etc/regdomain.xml#1 branch
.. //depot/projects/ia64/lib/libc/stdlib/strfmon.c#12 integrate
.. //depot/projects/ia64/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/ia64/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate
.. //depot/projects/ia64/release/doc/share/sgml/release.dsl#9 integrate
.. //depot/projects/ia64/release/doc/share/sgml/release.ent#25 integrate
.. //depot/projects/ia64/sbin/ifconfig/Makefile#13 integrate
.. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#51 integrate
.. //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#23 integrate
.. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#16 integrate
.. //depot/projects/ia64/sbin/ifconfig/regdomain.c#1 branch
.. //depot/projects/ia64/sbin/ifconfig/regdomain.h#1 branch
.. //depot/projects/ia64/share/man/man4/Makefile#108 integrate
.. //depot/projects/ia64/share/man/man4/altq.4#15 integrate
.. //depot/projects/ia64/share/man/man4/ath.4#33 integrate
.. //depot/projects/ia64/share/man/man4/awi.4#12 delete
.. //depot/projects/ia64/share/man/man4/cnw.4#3 integrate
.. //depot/projects/ia64/share/man/man4/ipw.4#11 integrate
.. //depot/projects/ia64/share/man/man4/iwi.4#13 integrate
.. //depot/projects/ia64/share/man/man4/malo.4#2 integrate
.. //depot/projects/ia64/share/man/man4/ral.4#9 integrate
.. //depot/projects/ia64/share/man/man4/rum.4#4 integrate
.. //depot/projects/ia64/share/man/man4/ural.4#11 integrate
.. //depot/projects/ia64/share/man/man4/wi.4#44 integrate
.. //depot/projects/ia64/share/man/man4/wlan.4#11 integrate
.. //depot/projects/ia64/share/man/man4/wlan_acl.4#3 integrate
.. //depot/projects/ia64/share/man/man4/wlan_amrr.4#3 integrate
.. //depot/projects/ia64/share/man/man4/wlan_xauth.4#3 integrate
.. //depot/projects/ia64/share/man/man4/wpi.4#2 integrate
.. //depot/projects/ia64/share/man/man4/zyd.4#2 integrate
.. //depot/projects/ia64/share/man/man5/Makefile#30 integrate
.. //depot/projects/ia64/share/man/man5/regdomain.5#1 branch
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#54 integrate
.. //depot/projects/ia64/sys/amd64/conf/GENERIC#49 integrate
.. //depot/projects/ia64/sys/amd64/include/cpufunc.h#11 integrate
.. //depot/projects/ia64/sys/arm/arm/intr.c#16 integrate
.. //depot/projects/ia64/sys/arm/at91/at91.c#8 integrate
.. //depot/projects/ia64/sys/arm/conf/AVILA#7 integrate
.. //depot/projects/ia64/sys/arm/conf/HL200#3 integrate
.. //depot/projects/ia64/sys/arm/conf/KB920X#9 integrate
.. //depot/projects/ia64/sys/arm/include/intr.h#8 integrate
.. //depot/projects/ia64/sys/conf/NOTES#123 integrate
.. //depot/projects/ia64/sys/conf/files#164 integrate
.. //depot/projects/ia64/sys/conf/files.pc98#75 integrate
.. //depot/projects/ia64/sys/conf/options#114 integrate
.. //depot/projects/ia64/sys/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/ia64/sys/contrib/pf/net/pf.c#26 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.c#78 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-dma.c#49 integrate
.. //depot/projects/ia64/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/ia64/sys/dev/ath/ah_osdep.h#3 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.c#9 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.h#3 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.c#9 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.h#4 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/sample/sample.c#10 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/sample/sample.h#6 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath.c#45 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#20 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#16 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athrate.h#6 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athvar.h#27 integrate
.. //depot/projects/ia64/sys/dev/awi/am79c930.c#7 delete
.. //depot/projects/ia64/sys/dev/awi/am79c930reg.h#3 delete
.. //depot/projects/ia64/sys/dev/awi/am79c930var.h#4 delete
.. //depot/projects/ia64/sys/dev/awi/awi.c#24 delete
.. //depot/projects/ia64/sys/dev/awi/awireg.h#3 delete
.. //depot/projects/ia64/sys/dev/awi/awivar.h#10 delete
.. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#18 delete
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_l2t.c#4 delete
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_l2t.h#4 delete
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_main.c#8 integrate
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_offload.c#4 integrate
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_offload.h#6 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate
.. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#32 integrate
.. //depot/projects/ia64/sys/dev/if_ndis/if_ndisvar.h#17 integrate
.. //depot/projects/ia64/sys/dev/ipw/if_ipw.c#14 integrate
.. //depot/projects/ia64/sys/dev/ipw/if_ipwvar.h#8 integrate
.. //depot/projects/ia64/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#19 integrate
.. //depot/projects/ia64/sys/dev/iwi/if_iwivar.h#10 integrate
.. //depot/projects/ia64/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/ia64/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/ia64/sys/dev/ral/if_ral_pci.c#7 integrate
.. //depot/projects/ia64/sys/dev/ral/if_ralrate.c#2 delete
.. //depot/projects/ia64/sys/dev/ral/if_ralrate.h#2 delete
.. //depot/projects/ia64/sys/dev/ral/rt2560.c#9 integrate
.. //depot/projects/ia64/sys/dev/ral/rt2560reg.h#4 integrate
.. //depot/projects/ia64/sys/dev/ral/rt2560var.h#5 integrate
.. //depot/projects/ia64/sys/dev/ral/rt2661.c#8 integrate
.. //depot/projects/ia64/sys/dev/ral/rt2661_ucode.h#2 delete
.. //depot/projects/ia64/sys/dev/ral/rt2661var.h#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/hda/hdac.c#12 integrate
.. //depot/projects/ia64/sys/dev/usb/if_rum.c#6 integrate
.. //depot/projects/ia64/sys/dev/usb/if_rumvar.h#3 integrate
.. //depot/projects/ia64/sys/dev/usb/if_ural.c#18 integrate
.. //depot/projects/ia64/sys/dev/usb/if_uralvar.h#7 integrate
.. //depot/projects/ia64/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/ia64/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/ia64/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs#89 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#15 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi.c#71 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#43 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#24 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wivar.h#25 integrate
.. //depot/projects/ia64/sys/dev/wi/spectrum24t_cf.h#3 delete
.. //depot/projects/ia64/sys/dev/wpi/if_wpi.c#3 integrate
.. //depot/projects/ia64/sys/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/ia64/sys/i386/conf/GENERIC#78 integrate
.. //depot/projects/ia64/sys/i386/conf/PAE#24 integrate
.. //depot/projects/ia64/sys/i386/include/cpufunc.h#21 integrate
.. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#47 integrate
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#107 integrate
.. //depot/projects/ia64/sys/mips/conf/IDT#2 integrate
.. //depot/projects/ia64/sys/modules/Makefile#110 integrate
.. //depot/projects/ia64/sys/modules/ath_rate_amrr/Makefile#6 integrate
.. //depot/projects/ia64/sys/modules/ath_rate_onoe/Makefile#5 integrate
.. //depot/projects/ia64/sys/modules/ath_rate_sample/Makefile#5 integrate
.. //depot/projects/ia64/sys/modules/awi/Makefile#5 delete
.. //depot/projects/ia64/sys/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/cxgb/tom/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/firmware/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/malo/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/ral/Makefile#4 integrate
.. //depot/projects/ia64/sys/modules/ralfw/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/ia64/sys/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/wlan/Makefile#8 integrate
.. //depot/projects/ia64/sys/modules/wlan_acl/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/wlan_ccmp/Makefile#3 integrate
.. //depot/projects/ia64/sys/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/ia64/sys/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/ia64/sys/modules/wlan_tkip/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/wlan_wep/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/wlan_xauth/Makefile#2 integrate
.. //depot/projects/ia64/sys/net/if.c#63 integrate
.. //depot/projects/ia64/sys/net/if_media.h#23 integrate
.. //depot/projects/ia64/sys/net80211/_ieee80211.h#9 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211.c#26 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211.h#13 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_acl.c#5 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_amrr.c#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto.c#10 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto.h#9 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto_ccmp.c#6 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto_none.c#5 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto_tkip.c#6 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto_wep.c#6 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_freebsd.c#13 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_freebsd.h#10 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_ht.h#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_input.c#28 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_input.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#25 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.h#13 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_node.c#25 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_node.h#19 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_output.c#26 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_proto.c#20 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_proto.h#16 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_scan_ap.c#3 delete
.. //depot/projects/ia64/sys/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_var.h#23 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_xauth.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/ng_base.c#38 integrate
.. //depot/projects/ia64/sys/netinet/in_pcb.c#59 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw2.c#73 integrate
.. //depot/projects/ia64/sys/netinet/ip_output.c#67 integrate
.. //depot/projects/ia64/sys/netinet/tcp_offload.h#2 integrate
.. //depot/projects/ia64/sys/netinet/tcp_syncache.c#55 integrate
.. //depot/projects/ia64/sys/netinet/tcp_var.h#43 integrate
.. //depot/projects/ia64/sys/netinet6/in6_pcb.c#39 integrate
.. //depot/projects/ia64/sys/pc98/cbus/clock.c#9 integrate
.. //depot/projects/ia64/sys/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/ia64/sys/pc98/conf/GENERIC#66 integrate
.. //depot/projects/ia64/sys/pc98/include/clock.h#4 integrate
.. //depot/projects/ia64/sys/security/audit/audit_arg.c#13 integrate
.. //depot/projects/ia64/sys/security/mac/mac_inet.c#9 integrate
.. //depot/projects/ia64/sys/sparc64/conf/GENERIC#70 integrate
.. //depot/projects/ia64/sys/sys/param.h#89 integrate
.. //depot/projects/ia64/tools/tools/net80211/Makefile#4 integrate
.. //depot/projects/ia64/tools/tools/net80211/scripts/config#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.dfs#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.fixed#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.local#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.mixed#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.simple#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.simple2#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.sta#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.tsn#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.updown#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.updown.wpa#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wds#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wdsmain#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wdsrelay#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wep#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa1.aes#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa1.tkip#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa2#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa2.tkip#1 branch
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/main.c#4 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/wlanstats.c#6 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanwds/Makefile#1 branch
.. //depot/projects/ia64/tools/tools/net80211/wlanwds/wlanwds.c#1 branch
.. //depot/projects/ia64/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/ia64/usr.sbin/wlandebug/wlandebug.c#2 integrate
.. //depot/projects/ia64/usr.sbin/wpa/hostapd/Makefile#5 integrate
.. //depot/projects/ia64/usr.sbin/wpa/hostapd/driver_freebsd.c#6 integrate
.. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/Packet32.c#4 integrate
.. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#8 integrate
.. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/driver_wired.c#1 branch

Differences ...

==== //depot/projects/ia64/ObsoleteFiles.inc#25 (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/ia64/UPDATING#103 (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/ia64/etc/Makefile#60 (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/ia64/etc/defaults/rc.conf#82 (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/ia64/etc/network.subr#23 (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/ia64/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/ia64/etc/rc.d/netif#19 (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/ia64/etc/rc.d/wpa_supplicant#4 (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/ia64/lib/libc/stdlib/strfmon.c#12 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.18 2008/04/19 07:22:58 ru Exp $");
 
 #include <sys/types.h>
 #include <ctype.h>
@@ -67,6 +67,8 @@
 	while (isdigit((unsigned char)*fmt)) {			\
 		VAR *= 10;					\
 		VAR += *fmt - '0';				\
+		if (VAR < 0)					\
+			goto e2big_error;			\
 		fmt++;						\
 	}							\
 } while (0)
@@ -187,7 +189,7 @@
 			/* Do we have enough space to put number with
 			 * required width ?
 			 */
-			if (dst + width >= s + maxsize)
+			if ((unsigned int)width >= maxsize - (dst - s))
 				goto e2big_error;
 		}
 
@@ -196,6 +198,8 @@
 			if (!isdigit((unsigned char)*++fmt))
 				goto format_error;
 			GET_NUMBER(left_prec);
+			if ((unsigned int)left_prec >= maxsize - (dst - s))
+				goto e2big_error;
 		}
 
 		/* Right precision */
@@ -203,6 +207,9 @@
 			if (!isdigit((unsigned char)*++fmt))
 				goto format_error;
 			GET_NUMBER(right_prec);
+			if ((unsigned int)right_prec >= maxsize - (dst - s) -
+			    left_prec)
+				goto e2big_error;
 		}
 
 		/* Conversion Characters */
@@ -218,6 +225,8 @@
 				goto format_error;
 		}
 
+		if (currency_symbol != NULL)
+			free(currency_symbol);
 		if (flags & USE_INTL_CURRENCY) {
 			currency_symbol = strdup(lc->int_curr_symbol);
 			if (currency_symbol != NULL)
@@ -246,6 +255,8 @@
 				pad_size = 0;
 		}
 
+		if (asciivalue != NULL)
+			free(asciivalue);
 		asciivalue = __format_grouped_double(value, &flags,
 				left_prec, right_prec, pad_char);
 		if (asciivalue == NULL)

==== //depot/projects/ia64/lib/libc/sys/cpuset.2#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.1 2008/03/29 10:06:30 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
 .\"
 .Dd March 29, 2008
 .Dt CPUSET 2
@@ -36,6 +36,7 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
+.In sys/param.h
 .In sys/cpuset.h
 .Ft int
 .Fn cpuset "cpusetid_t *setid"

==== //depot/projects/ia64/lib/libc/sys/cpuset_getaffinity.2#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.1 2008/03/29 10:26:29 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
 .\"
 .Dd March 29, 2008
 .Dt CPUSET 2
@@ -35,6 +35,7 @@
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
+.In sys/param.h
 .In sys/cpuset.h
 .Ft int
 .Fn cpuset_getaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "cpuset_t *mask"

==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 (text+ko) ====

@@ -7,9 +7,6 @@
 
 <!-- Text constants which probably don't need to be changed.-->
 
-<!-- The marker for MFCs. -->
-<!ENTITY merged "[MERGED]">
-
 <!ENTITY % include.historic "IGNORE">
 <!ENTITY % no.include.historic "IGNORE">
 ]>
@@ -20,7 +17,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1085 2008/04/17 00:57:34 delphij Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1088 2008/04/20 18:17:33 hrs Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -145,27 +142,27 @@
       assignment.  The &man.cpuset.1; userland utility has been added
       to allow manipulation of processor sets.</para>
 
-    <para>The &man.ddb.4; kernel debugger now has an output capture
+    <para role="merged">The &man.ddb.4; kernel debugger now has an output capture
       facility.  Input and output from &man.ddb.4; can now be captured
       to a memory buffer for later inspection using &man.sysctl.8; or
       a textdump.  The new <command>capture</command> command controls
-      this feature. &merged;</para>
+      this feature.</para>
 
-    <para>The &man.ddb.4; debugger now supports a simple scripting
+    <para role="merged">The &man.ddb.4; debugger now supports a simple scripting
       facility, which supports a set of named scripts consisting of a
       set of &man.ddb.4; commands.  These commands can be managed from
       within &man.ddb.4; or with the use of the new &man.ddb.8;
       utility.  More details can be found in the &man.ddb.4; manual
-      page. &merged;</para>
+      page.</para>
 
-    <para>The kernel now supports a new textdump format of kernel
+    <para role="merged">The kernel now supports a new textdump format of kernel
       dumps.  A textdump provides higher-level information via
       mechanically generated/extracted debugging output, rather than a
       simple memory dump.  This facility can be used to generate brief
       kernel bug reports that are rich in debugging information, but
       are not dependent on kernel symbol tables or precisely
       synchronized source code.  More information can be found in the
-      &man.textdump.4; manual page. &merged;</para>
+      &man.textdump.4; manual page.</para>
 
     <para>Kernel support for M:N threading has been removed.  While
       the KSE (Kernel Scheduled Entities) project was quite successful
@@ -181,39 +178,39 @@
       interface for user applications to test the presence of
       features.</para>
 
-    <para>[&arch.amd64;] The &os; kernel now has support for large
+    <para arch="amd64">The &os; kernel now has support for large
       memory page mappings (<quote>superpages</quote>).</para>
 
-    <para>[&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE
+    <para arch="amd64,i386,ia64,powerpc" role="merged">The ULE
       scheduler is now the default process scheduler
-      in <filename>GENERIC</filename> kernels. &merged;</para>
+      in <filename>GENERIC</filename> kernels.</para>
 
     <sect3 id="boot">
       <title>Boot Loader Changes</title>
 
-      <para>[&arch.amd64;, &arch.i386;] The BTX kernel used by the boot
+      <para arch="amd64,i386" role="merged">The BTX kernel used by the boot
 	loader has been changed to invoke BIOS routines from real
 	mode.  This change makes it possible to boot &os; from USB
-	devices. &merged;</para>
+	devices.</para>
 
-      <para>[&arch.amd64;, &arch.i386;] A new gptboot boot loader has
+      <para arch="amd64,i386" role="merged">A new gptboot boot loader has
         been added to support booting from a GPT labeled disk.  A
         new <command>boot</command> command has been added to
         &man.gpt.8;, which makes a GPT disk bootable by writing the
         required bits of the boot loader, creating a new boot
-        partition if required. &merged;</para>
+        partition if required.</para>
 
     </sect3>
 
     <sect3 id="proc">
       <title>Hardware Support</title>
 
-      <para>The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
-        PCMCIA smartcard readers, has been added. &merged;</para>
+      <para role="merged">The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
+        PCMCIA smartcard readers, has been added.</para>
 
-      <para>The &man.uslcom.4; driver, a driver for Silicon
+      <para role="merged">The &man.uslcom.4; driver, a driver for Silicon
         Laboratories CP2101/CP2102-based USB serial adapters, has been
-        imported from OpenBSD. &merged;</para>
+        imported from OpenBSD.</para>
 
       <sect4 id="mm">
 	<title>Multimedia Support</title>
@@ -250,9 +247,8 @@
 	  number of outstanding issues.  It also now works on all
 	  architectures.</para>
 
-	<para>[&arch.amd64;, &arch.i386;] The &man.wpi.4; driver has
-	  been updated to include a number of stability fixes.
-	  &merged;</para>
+	<para arch="amd64,i386" role="merged">The &man.wpi.4; driver has
+	  been updated to include a number of stability fixes.</para>
 
       </sect4>
     </sect3>
@@ -267,16 +263,16 @@
         the <varname>net.bpf.zerocopy_enable</varname> sysctl
         variable to <literal>1</literal>.</para>
 
-      <para>A bug in TCP options padding, where the wrong padding
-        bytes were used, has been fixed. &merged;</para>
+      <para role="merged">A bug in TCP options padding, where the wrong padding
+        bytes were used, has been fixed.</para>
 
     </sect3>
 
     <sect3 id="disks">
       <title>Disks and Storage</title>
 
-      <para>The &man.aac.4; driver now supports volumes larger than
-        2TB in size. &merged;</para>
+      <para role="merged">The &man.aac.4; driver now supports volumes larger than
+        2TB in size.</para>
 
       <para>The &man.ata.4; driver now supports a spindown command for
         disks; after a configurable amount of time, if no requests
@@ -285,8 +281,8 @@
         supports a <command>spindown</command> command to configure
         this feature.</para>
 
-      <para>The &man.hptrr.4; driver has been updated to version 1.2
-        from Highpoint. &merged;</para>
+      <para role="merged">The &man.hptrr.4; driver has been updated to version 1.2
+        from Highpoint.</para>
 
     </sect3>
 
@@ -307,23 +303,31 @@
   <sect2 id="userland">
     <title>Userland Changes</title>
 
-    <para>The &man.adduser.8; utility now supports
+    <para role="merged">The &man.adduser.8; utility now supports
       a <option>-M</option> option to set the mode of a new user's
-      home directory. &merged;</para>
+      home directory.</para>
 
     <para>BSD-licensed versions of &man.ar.1; and &man.ranlib.1;,
       based on <filename>libarchive</filename>, have replaced the GNU
       Binutils versions of these utilities.</para>
 
-    <para>&man.chflags.1; now supports a <option>-v</option> flag for
+    <para role="merged">&man.chflags.1; now supports a <option>-v</option> flag for
       verbose output and a <option>-f</option> flag to ignore errors
       with the same semantics as (for example)
-      &man.chmod.1;. &merged;</para>
+      &man.chmod.1;.</para>
 
     <para>For compatiblity with other implementations, &man.cp.1; now
       supports a <option>-a</option> flag, which is equivalent to
       specifying the <option>-RrP</option> flags.</para>
 
+    <para>The &man.env.1; program now supports <option>-u
+      <replaceable>name</replaceable></option>
+      which will completely unset the given variable
+      <replaceable>name</replaceable> by removing it from the environment,
+      instead of just setting it to a null value.</para>
+
+    <para>The &man.fdopendir.3; library function has been added.</para>
+
     <para>&man.find.1; has been enhanced by the addition of a number
       of primaries that were present in GNU find but not &os;
       &man.find.1;.</para>
@@ -342,9 +346,9 @@
     <para>The &man.procstat.1; utility has been added to display
       detailed information about processes.</para>
 
-    <para>The &man.realpath.1; utility now supports
+    <para role="merged">The &man.realpath.1; utility now supports
       a <option>-q</option> flag to suppress warnings; it now also
-      accepts multiple paths on its command line. &merged; </para>
+      accepts multiple paths on its command line.</para>
 
     <para>The &man.split.1; utility now supports a <option>-n</option>
       flag to split a file into a certain number of chunks.</para>

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804210019.m3L0JIlr004023>