PERFORCE change 125736 for review
Xin LI
delphij at FreeBSD.org
Mon Aug 27 02:11:40 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=125736
Change 125736 by delphij at delphij_odin on 2007/08/27 09:11:08
IFC
Affected files ...
.. //depot/projects/delphij_fork/etc/rc.d/jail#3 edit
.. //depot/projects/delphij_fork/etc/rc.d/mdconfig#2 integrate
.. //depot/projects/delphij_fork/gnu/lib/libdialog/dialog.h#2 integrate
.. //depot/projects/delphij_fork/include/arpa/inet.h#2 integrate
.. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate
.. //depot/projects/delphij_fork/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/delphij_fork/sbin/sysctl/sysctl.8#2 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/africa#2 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/antarctica#2 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/australasia#2 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/europe#2 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/leapseconds#3 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/northamerica#2 integrate
.. //depot/projects/delphij_fork/share/zoneinfo/zone.tab#2 integrate
.. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_sge.c#6 integrate
.. //depot/projects/delphij_fork/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/mfi/mfi_pci.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/mfi/mfireg.h#3 integrate
.. //depot/projects/delphij_fork/sys/dev/mfi/mfivar.h#3 integrate
.. //depot/projects/delphij_fork/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/delphij_fork/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/delphij_fork/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/delphij_fork/sys/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp.h#5 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_asconf.c#8 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_auth.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_constants.h#6 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_indata.c#6 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_input.c#9 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_output.c#8 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#8 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.h#7 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_peeloff.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_structs.h#6 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_sysctl.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_sysctl.h#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_uio.h#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_usrreq.c#9 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_var.h#5 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctputil.c#8 integrate
.. //depot/projects/delphij_fork/sys/netinet6/sctp6_usrreq.c#8 integrate
Differences ...
==== //depot/projects/delphij_fork/etc/rc.d/jail#3 (text+ko) ====
==== //depot/projects/delphij_fork/etc/rc.d/mdconfig#2 (text) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/mdconfig,v 1.4 2006/12/31 10:37:18 yar Exp $
+# $FreeBSD: src/etc/rc.d/mdconfig,v 1.5 2007/08/25 00:19:17 matteo Exp $
#
# PROVIDE: mdconfig
@@ -115,6 +115,8 @@
fi
if [ "${_file}" != "${_file%.uzip}" ]; then
load_kld -m g_uzip geom_uzip || return 3
+ # sleep a bit to allow creation of /dev/mdX.uzip
+ sleep 2
fi
fi
if mdconfig -l -u ${_md} >/dev/null 2>&1; then
==== //depot/projects/delphij_fork/gnu/lib/libdialog/dialog.h#2 (text+ko) ====
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $FreeBSD: src/gnu/lib/libdialog/dialog.h,v 1.22 2000/12/14 02:35:22 jkh Exp $
+ * $FreeBSD: src/gnu/lib/libdialog/dialog.h,v 1.23 2007/08/24 16:26:24 ache Exp $
*
*/
@@ -74,7 +74,7 @@
} dialogMenuItem;
#define VERSION "0.4"
-#define MAX_LEN 2048
+#define MAX_LEN 4096
#ifndef TRUE
#define TRUE (1)
==== //depot/projects/delphij_fork/include/arpa/inet.h#2 (text+ko) ====
@@ -56,7 +56,7 @@
/*%
* @(#)inet.h 8.1 (Berkeley) 6/2/93
* $Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp $
- * $FreeBSD: src/include/arpa/inet.h,v 1.29 2007/06/14 07:13:28 delphij Exp $
+ * $FreeBSD: src/include/arpa/inet.h,v 1.30 2007/08/24 20:25:52 bms Exp $
*/
#ifndef _ARPA_INET_H_
@@ -154,8 +154,6 @@
int inet_pton(int, const char * __restrict, void * __restrict);
#if __BSD_VISIBLE
-int ascii2addr(int, const char *, void *);
-char *addr2ascii(int, const void *, int, char *);
int inet_aton(const char *, struct in_addr *);
in_addr_t inet_lnaof(struct in_addr);
struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
==== //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 (text+ko) ====
@@ -20,7 +20,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1060 2007/08/18 16:40:37 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1061 2007/08/24 15:18:42 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -588,6 +588,10 @@
which supports Cronyx Tau-PCI/32 adapters, has been added.
&merged;</para>
+ <para>[&arch.i386;, &arch.amd64;] The &man.coretemp.4; driver
+ has been added to provide temperature readings on &intel;
+ &core; processors.</para>
+
<para>The <literal>est</literal> &man.cpufreq.4; driver now supports
frequency control for the VIA C7-M family of processors.</para>
@@ -2301,7 +2305,7 @@
<para>The timezone database has been updated from the
<application>tzdata2005l</application> release to the
- <application>tzdata2006n</application> release. &merged;</para>
+ <application>tzdata2007g</application> release. &merged;</para>
<para><application>tip</application> has been updated to a
snapshot from OpenBSD as of 20060831.</para>
==== //depot/projects/delphij_fork/sbin/ipfw/ipfw2.c#2 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.106 2007/06/18 17:52:37 maxim Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.107 2007/08/26 18:38:31 maxim Exp $
*/
#include <sys/param.h>
@@ -2575,7 +2575,7 @@
for (n = 0, d = dynrules; n < ndyn; n++, d++) {
if (use_set) {
/* skip rules from another set */
- bcopy(&d->rule + sizeof(uint16_t),
+ bcopy((char *)&d->rule + sizeof(uint16_t),
&set, sizeof(uint8_t));
if (set != use_set - 1)
continue;
@@ -2603,7 +2603,7 @@
printf("## Dynamic rules (%d):\n", ndyn);
for (n = 0, d = dynrules; n < ndyn; n++, d++) {
if (use_set) {
- bcopy(&d->rule + sizeof(uint16_t),
+ bcopy((char *)&d->rule + sizeof(uint16_t),
&set, sizeof(uint8_t));
if (set != use_set - 1)
continue;
@@ -2660,7 +2660,7 @@
if (rulenum > rnum)
break;
if (use_set) {
- bcopy(&d->rule + sizeof(uint16_t),
+ bcopy((char *)&d->rule + sizeof(uint16_t),
&set, sizeof(uint8_t));
if (set != use_set - 1)
continue;
==== //depot/projects/delphij_fork/sbin/sysctl/sysctl.8#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.60 2005/11/18 10:32:12 ru Exp $
+.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.61 2007/08/24 20:38:09 danger Exp $
.\"
.Dd September 15, 2005
.Dt SYSCTL 8
@@ -214,6 +214,7 @@
.It "hw.pagesize integer no
.It "hw.floatingpoint integer no
.It "hw.machine_arch string no
+.It "hw.realmem integer no
.It "machdep.console_device dev_t no
.It "machdep.adjkerntz integer yes
.It "machdep.disable_rtc_set integer yes
==== //depot/projects/delphij_fork/share/zoneinfo/africa#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)africa 8.8
+# @(#)africa 8.9
# <pre>
# This data is by no means authoritative; if you think you know better,
@@ -218,7 +218,15 @@
# after observing the daylight saving time since May.
# http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
Rule Egypt 2006 only - Sep 21 23:00s 0 -
-Rule Egypt 2007 max - Sep lastThu 23:00s 0 -
+# From Dirk Losch (2007-08-14):
+# I received a mail from an airline which says that the daylight
+# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
+# From Jesper Norgaard Welen (2007-08-15): [The following agree:]
+# http://www.nentjes.info/Bill/bill5.htm
+# http://www.timeanddate.com/worldclock/city.html?n=53
+# From Paul Eggert (2007-08-17):
+# For lack of better info, assume the new rule is first Thursday.
+Rule Egypt 2007 max - Sep Thu>=1 23:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Cairo 2:05:00 - LMT 1900 Oct
==== //depot/projects/delphij_fork/share/zoneinfo/antarctica#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)antarctica 8.3
+# @(#)antarctica 8.4
# <pre>
# From Paul Eggert (1999-11-15):
@@ -191,10 +191,12 @@
Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D
Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D
Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D
-Rule NZAQ 1990 max - Oct Sun>=1 2:00s 1:00 D
+Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D
Rule NZAQ 1975 only - Feb 23 2:00s 0 S
Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S
-Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 S
+Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S
+Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D
+Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S
# Norway - territories
# Bouvet (never inhabited)
==== //depot/projects/delphij_fork/share/zoneinfo/australasia#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)australasia 8.7
+# @(#)australasia 8.8
# <pre>
# This file also includes Pacific islands.
@@ -79,7 +79,7 @@
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule AS 1971 1985 - Oct lastSun 2:00s 1:00 -
Rule AS 1986 only - Oct 19 2:00s 1:00 -
-Rule AS 1987 max - Oct lastSun 2:00s 1:00 -
+Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 -
Rule AS 1972 only - Feb 27 2:00s 0 -
Rule AS 1973 1985 - Mar Sun>=1 2:00s 0 -
Rule AS 1986 1989 - Mar Sun>=15 2:00s 0 -
@@ -90,7 +90,9 @@
Rule AS 1994 only - Mar Sun>=18 2:00s 0 -
Rule AS 1995 2005 - Mar lastSun 2:00s 0 -
Rule AS 2006 only - Apr Sun>=1 2:00s 0 -
-Rule AS 2007 max - Mar lastSun 2:00s 0 -
+Rule AS 2007 only - Mar lastSun 2:00s 0 -
+Rule AS 2008 max - Apr Sun>=1 2:00s 0 -
+Rule AS 2008 max - Oct Sun>=1 2:00s 1:00 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Australia/Adelaide 9:14:20 - LMT 1895 Feb
9:00 - CST 1899 May
@@ -121,7 +123,8 @@
Rule AT 2000 only - Aug lastSun 2:00s 1:00 -
Rule AT 2001 max - Oct Sun>=1 2:00s 1:00 -
Rule AT 2006 only - Apr Sun>=1 2:00s 0 -
-Rule AT 2007 max - Mar lastSun 2:00s 0 -
+Rule AT 2007 only - Mar lastSun 2:00s 0 -
+Rule AT 2008 max - Apr Sun>=1 2:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Australia/Hobart 9:49:16 - LMT 1895 Sep
10:00 - EST 1916 Oct 1 2:00
@@ -145,9 +148,11 @@
Rule AV 1991 1994 - Mar Sun>=1 2:00s 0 -
Rule AV 1995 2005 - Mar lastSun 2:00s 0 -
Rule AV 2000 only - Aug lastSun 2:00s 1:00 -
-Rule AV 2001 max - Oct lastSun 2:00s 1:00 -
+Rule AV 2001 2007 - Oct lastSun 2:00s 1:00 -
Rule AV 2006 only - Apr Sun>=1 2:00s 0 -
-Rule AV 2007 max - Mar lastSun 2:00s 0 -
+Rule AV 2007 only - Mar lastSun 2:00s 0 -
+Rule AV 2008 max - Apr Sun>=1 2:00s 0 -
+Rule AV 2008 max - Oct Sun>=1 2:00s 1:00 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Australia/Melbourne 9:39:52 - LMT 1895 Feb
10:00 Aus EST 1971
@@ -166,9 +171,11 @@
Rule AN 1990 1995 - Mar Sun>=1 2:00s 0 -
Rule AN 1996 2005 - Mar lastSun 2:00s 0 -
Rule AN 2000 only - Aug lastSun 2:00s 1:00 -
-Rule AN 2001 max - Oct lastSun 2:00s 1:00 -
+Rule AN 2001 2007 - Oct lastSun 2:00s 1:00 -
Rule AN 2006 only - Apr Sun>=1 2:00s 0 -
-Rule AN 2007 max - Mar lastSun 2:00s 0 -
+Rule AN 2007 only - Mar lastSun 2:00s 0 -
+Rule AN 2008 max - Apr Sun>=1 2:00s 0 -
+Rule AN 2008 max - Oct Sun>=1 2:00s 1:00 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Australia/Sydney 10:04:52 - LMT 1895 Feb
10:00 Aus EST 1971
@@ -191,9 +198,11 @@
Rule LH 1990 1995 - Mar Sun>=1 2:00 0 -
Rule LH 1996 2005 - Mar lastSun 2:00 0 -
Rule LH 2000 only - Aug lastSun 2:00 0:30 -
-Rule LH 2001 max - Oct lastSun 2:00 0:30 -
+Rule LH 2001 2007 - Oct lastSun 2:00 0:30 -
Rule LH 2006 only - Apr Sun>=1 2:00 0 -
-Rule LH 2007 max - Mar lastSun 2:00 0 -
+Rule LH 2007 only - Mar lastSun 2:00 0 -
+Rule LH 2008 max - Apr Sun>=1 2:00 0 -
+Rule LH 2008 max - Oct Sun>=1 2:00 0:30 -
Zone Australia/Lord_Howe 10:36:20 - LMT 1895 Feb
10:00 - EST 1981 Mar
10:30 LH LHST
@@ -453,11 +462,20 @@
# US minor outlying islands
# Howland, Baker
-# uninhabited since World War II
-# no information; was probably like Pacific/Pago_Pago
+# Howland was mined for guano by American companies 1857-1878 and British
+# 1886-1891; Baker was similar but exact dates are not known.
+# Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
+# uninhabited thereafter.
+# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
+# see page 206 of Elgen M. Long and Marie K. Long,
+# Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
+# So most likely Howland and Baker observed Hawaii Time from 1935
+# until they were abandoned after the war.
# Jarvis
-# uninhabited since 1958
+# Mined for guano by American companies 1857-1879 and British 1883?-1891?.
+# Inhabited by civilians 1935-1942; IGY scientific base 1957-1958;
+# uninhabited thereafter.
# no information; was probably like Pacific/Kiritimati
# Johnston
@@ -866,33 +884,13 @@
# introduction of standard time in 1895.
-# South Australia, Tasmania, Victoria
-
-# From Arthur David Olson (1992-03-08):
-# The rules from version 7.1 follow.
-# There are lots of differences between these rules and
-# the Shepherd et al. rules. Since the Shepherd et al. rules
-# and Bradley White's newspaper article are in agreement on
-# current DST ending dates, no worries.
+# southeast Australia
#
-# Rule Oz 1971 1985 - Oct lastSun 2:00 1:00 -
-# Rule Oz 1986 max - Oct Sun>=18 2:00 1:00 -
-# Rule Oz 1972 only - Feb 27 3:00 0 -
-# Rule Oz 1973 1986 - Mar Sun>=1 3:00 0 -
-# Rule Oz 1987 max - Mar Sun>=15 3:00 0 -
-# Zone Australia/Tasmania 10:00 Oz EST
-# Zone Australia/South 9:30 Oz CST
-# Zone Australia/Victoria 10:00 Oz EST 1985 Oct lastSun 2:00
-# 10:00 1:00 EST 1986 Mar Sun>=15 3:00
-# 10:00 Oz EST
+# From Paul Eggert (2007-07-23):
+# Starting autumn 2008 Victoria, NSW, South Australia, Tasmania and the ACT
+# end DST the first Sunday in April and start DST the first Sunday in October.
+# http://www.theage.com.au/news/national/daylight-savings-to-span-six-months/2007/06/27/1182623966703.html
-# From Robert Elz (1991-03-06):
-# I believe that the current start date for DST is "lastSun" in Oct...
-# that changed Oct 89. That is, we're back to the
-# original rule, and that rule currently applies in all the states
-# that have dst, incl Qld. (Certainly it was true in Vic).
-# The file I'm including says that happened in 1988, I think
-# that's incorrect, but I'm not 100% certain.
# South Australia
@@ -938,6 +936,9 @@
# was gazetted in the Government Hansard on Sep 26 1994....
# start on last Sunday in October and end in last sunday in March.
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
# Tasmania
# The rules for 1967 through 1991 were reported by George Shepherd
@@ -960,6 +961,9 @@
# Sim Alam (2000-07-03) reported a legal citation for the 2000/2001 rules:
# http://www.thelaw.tas.gov.au/fragview/42++1968+GS3A@EN+2000070300
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
# Victoria
# The rules for 1971 through 1991 were reported by George Shepherd
@@ -989,6 +993,9 @@
# [1] http://www.hup.harvard.edu/catalog/HEISUN.html
# [2] http://www.shrine.org.au
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
# New South Wales
# From Arthur David Olson:
@@ -1055,6 +1062,9 @@
# The Queensland Premier Peter Beattie is encouraging northern NSW
# towns to use Queensland time.
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
# Yancowinna
# From John Mackin (1989-01-04):
@@ -1106,6 +1116,9 @@
# For Lord Howe dates we use Shanks & Pottenger through 1989, and
# Lonergan thereafter. For times we use Lonergan.
+# From Paul Eggert (2007-07-23):
+# See "southeast Australia" above for 2008 and later.
+
###############################################################################
# New Zealand
==== //depot/projects/delphij_fork/share/zoneinfo/europe#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)europe 8.10
+# @(#)europe 8.11
# <pre>
# This data is by no means authoritative; if you think you know better,
@@ -444,7 +444,7 @@
###############################################################################
-# Continental Europe
+# Europe
# EU rules are for the European Union, previously known as the EC, EEC,
# Common Market, etc.
@@ -2386,6 +2386,8 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Most of Ukraine since 1970 has been like Kiev.
+# "Kyiv" is the transliteration of the Ukrainian name, but
+# "Kiev" is more common in English.
Zone Europe/Kiev 2:02:04 - LMT 1880
2:02:04 - KMT 1924 May 2 # Kiev Mean Time
2:00 - EET 1930 Jun 21
@@ -2397,6 +2399,8 @@
2:00 E-Eur EE%sT 1995
2:00 EU EE%sT
# Ruthenia used CET 1990/1991.
+# "Uzhhorod" is the transliteration of the Ukrainian name, but
+# "Uzhgorod" is more common in English.
Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct
1:00 - CET 1940
1:00 C-Eur CE%sT 1944 Oct
@@ -2409,7 +2413,10 @@
2:00 E-Eur EE%sT 1995
2:00 EU EE%sT
# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
-# Zaporozh'ye has an apostrophe, but Posix file names can't have apostrophes.
+# "Zaporizhia" is the transliteration of the Ukrainian name, but
+# "Zaporozh'ye" is more common in English. Use the common English
+# spelling, except omit the apostrophe as it is not allowed in
+# portable Posix file names.
Zone Europe/Zaporozhye 2:20:40 - LMT 1880
2:20 - CUT 1924 May 2 # Central Ukraine T
2:00 - EET 1930 Jun 21
==== //depot/projects/delphij_fork/share/zoneinfo/leapseconds#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)leapseconds 8.3
+# @(#)leapseconds 8.4
# Allowance for leapseconds added to each timezone file.
@@ -45,39 +45,38 @@
Leap 1998 Dec 31 23:59:60 + S
Leap 2005 Dec 31 23:59:60 + S
-# ...
-# Date: Thu, 28 Jun 2007 14:36:55 +0200
-# Message-Id: <200706281236.l5SCatpA020400 at callisto.obspm.fr>
-# ...
-# Subject: Bulletin C number 34
-# ...
-# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
-#
+# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
#
# SERVICE DE LA ROTATION TERRESTRE
# OBSERVATOIRE DE PARIS
# 61, Av. de l'Observatoire 75014 PARIS (France)
-# ...
+# Tel. : 33 (0) 1 40 51 22 26
+# FAX : 33 (0) 1 40 51 22 91
+# Internet : services.iers at obspm.fr
+#
+# Paris, 28 June 2007
+#
+# Bulletin C 34
#
-# Paris, 28 June 2007
-# Bulletin C 34
-# To authorities responsible
-# for the measurement and
-# distribution of time
+# To authorities responsible
+# for the measurement and
+# distribution of time
#
-# INFORMATION ON UTC - TAI
+# INFORMATION ON UTC - TAI
#
# NO positive leap second will be introduced at the end of December 2007.
# The difference between Coordinated Universal Time UTC and the
-# International Atomic Time TAI is:
-# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = -33 s
-# Leap seconds can be introduced in UTC at the end of the months of
-# December or June, depending on the evolution of UT1-TAI. Bulletin C is
-# mailed every six months, either to announce a time step in UTC, or to
-# confirm that there will be no time step at the next possible date.
+# International Atomic Time TAI is :
+#
+# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = -33 s
+#
+# Leap seconds can be introduced in UTC at the end of the months of December
+# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
+# six months, either to announce a time step in UTC, or to confirm that there
+# will be no time step at the next possible date.
#
-# Daniel GAMBIS
-# Director
-# Earth Orientation Center of IERS
-# Observatoire de Paris, France
+# Daniel GAMBIS
+# Director
+# Earth Orientation Center of IERS
+# Observatoire de Paris, France
==== //depot/projects/delphij_fork/share/zoneinfo/northamerica#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)northamerica 8.17
+# @(#)northamerica 8.18
# <pre>
# also includes Central America and the Caribbean
@@ -348,7 +348,7 @@
#
# Colorado, far western Kansas, Montana, western
# Nebraska, Nevada border (Jackpot, Owyhee, and Mountain City),
-# New Mexico, southwestern North Dakota, far eastern Oregon,
+# New Mexico, southwestern North Dakota,
# western South Dakota, far western Texas (El Paso County, Hudspeth County,
# and Pine Springs and Nickel Creek in Culberson County), Utah, Wyoming
#
@@ -369,7 +369,8 @@
# US Pacific time, represented by Los Angeles
#
# California, northern Idaho (Benewah, Bonner, Boundary, Clearwater,
-# Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties),
+# Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties,
+# and the northern three-quarters of Idaho county),
# most of Nevada, most of Oregon, and Washington
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
@@ -527,7 +528,8 @@
# Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
# Custer, Elmore, Franklin, Fremont, Gem, Gooding, Jefferson, Jerome,
# Lemhi, Lincoln, Madison, Minidoka, Oneida, Owyhee, Payette, Power,
-# Teton, Twin Falls, Valley, Washington counties) and eastern Oregon
+# Teton, Twin Falls, Valley, Washington counties, and the southern
+# quarter of Idaho county) and eastern Oregon (most of Malheur County)
# switched four weeks late in 1974.
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -544,7 +546,7 @@
# What time is it in Indiana?
# </a> (2006-03-01)
#
-# From Paul Eggert (2006-03-22):
+# From Paul Eggert (2007-08-17):
# Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
# with the following exceptions:
#
@@ -556,11 +558,8 @@
# - Clark, Floyd, and Harrison counties have been like
# America/Kentucky/Louisville.
#
-# - Daviess, Dubois, Knox, Martin, Perry, and Pulaski counties
-# have been like America/Indiana/Vincennes.
-#
-# - Crawford, Pike, Starke, and Switzerland counties have their own time zone
-# histories as noted below.
+# - Crawford, Daviess, Dubois, Knox, Martin, Perry, Pike, Pulaski, Starke,
+# and Switzerland counties have their own time zone histories as noted below.
#
# Shanks partitioned Indiana into 345 regions, each with its own time history,
# and wrote ``Even newspaper reports present contradictory information.''
@@ -628,8 +627,9 @@
-5:00 - EST 2006
-5:00 US E%sT
#
-# Daviess, Dubois, Knox, Martin, and Perry Counties, Indiana,
-# switched from eastern to central time in April 2006.
+# Daviess, Dubois, Knox, and Martin Counties, Indiana,
+# switched from eastern to central time in April 2006, then switched back
+# in November 2007.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D
Rule Vincennes 1946 only - Sep lastSun 2:00 0 S
@@ -647,10 +647,31 @@
-5:00 - EST 1969
-5:00 US E%sT 1971
-5:00 - EST 2006 Apr 2 2:00
+ -6:00 US C%sT 2007 Nov 4 2:00
+ -5:00 US E%sT
+#
+# Perry County, Indiana, switched from eastern to central time in April 2006.
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
+Rule Perry 1946 only - Apr lastSun 2:00 1:00 D
+Rule Perry 1946 only - Sep lastSun 2:00 0 S
+Rule Perry 1953 1954 - Apr lastSun 2:00 1:00 D
+Rule Perry 1953 1959 - Sep lastSun 2:00 0 S
+Rule Perry 1955 only - May 1 0:00 1:00 D
+Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
+Rule Perry 1960 only - Oct lastSun 2:00 0 S
+Rule Perry 1961 only - Sep lastSun 2:00 0 S
+Rule Perry 1962 1963 - Oct lastSun 2:00 0 S
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57
+ -6:00 US C%sT 1946
+ -6:00 Perry C%sT 1964 Apr 26 2:00
+ -5:00 - EST 1969
+ -5:00 US E%sT 1971
+ -5:00 - EST 2006 Apr 2 2:00
-6:00 US C%sT
#
# Pike County, Indiana moved from central to eastern time in 1977,
-# then switched back in 2006.
+# then switched back in 2006, then switched back again in 2007.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Pike 1955 only - May 1 0:00 1:00 D
Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
@@ -663,7 +684,8 @@
-5:00 - EST 1966 Oct 30 2:00
-6:00 US C%sT 1977 Oct 30 2:00
-5:00 - EST 2006 Apr 2 2:00
- -6:00 US C%sT
+ -6:00 US C%sT 2007 Nov 4 2:00
+ -5:00 US E%sT
#
# Starke County, Indiana moved from central to eastern time in 1991,
# then switched back in 2006.
==== //depot/projects/delphij_fork/share/zoneinfo/zone.tab#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)zone.tab 8.10
+# @(#)zone.tab 8.11
#
# TZ zone descriptions
#
@@ -39,7 +39,7 @@
AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills
AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula
AQ -7824+10654 Antarctica/Vostok Vostok Station, S Magnetic Pole
-AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Base, Terre Adelie
+AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
@@ -65,7 +65,7 @@
AU -1228+13050 Australia/Darwin Northern Territory
AU -3157+11551 Australia/Perth Western Australia - most locations
AU -3143+12852 Australia/Eucla Western Australia - Eucla area
-AW +1230-06858 America/Aruba
+AW +1230-06958 America/Aruba
AX +6006+01957 Europe/Mariehamn
AZ +4023+04951 Asia/Baku
BA +4352+01825 Europe/Sarajevo
@@ -117,10 +117,10 @@
CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut
CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario
CA +4843-09434 America/Rainy_River Central Time - Rainy River & Fort Frances, Ontario
-CA +6903-10505 America/Cambridge_Bay Central Time - west Nunavut
CA +5024-10439 America/Regina Central Standard Time - Saskatchewan - most locations
CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan - midwest
CA +5333-11328 America/Edmonton Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut
CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories
CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories
CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
@@ -175,7 +175,7 @@
FO +6201-00646 Atlantic/Faroe
FR +4852+00220 Europe/Paris
GA +0023+00927 Africa/Libreville
-GB +512830-0001845 Europe/London
+GB +513030-0000731 Europe/London
GD +1203-06145 America/Grenada
GE +4143+04449 Asia/Tbilisi
GF +0456-05220 America/Cayenne
@@ -369,10 +369,10 @@
TZ -0648+03917 Africa/Dar_es_Salaam
UA +5026+03031 Europe/Kiev most locations
UA +4837+02218 Europe/Uzhgorod Ruthenia
-UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk
+UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
UA +4457+03406 Europe/Simferopol central Crimea
UG +0019+03225 Africa/Kampala
-UM +1700-16830 Pacific/Johnston Johnston Atoll
+UM +1645-16931 Pacific/Johnston Johnston Atoll
UM +2813-17722 Pacific/Midway Midway Islands
UM +1917+16637 Pacific/Wake Wake Island
US +404251-0740023 America/New_York Eastern Time
@@ -380,12 +380,13 @@
US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky - Louisville area
US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County
US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana - most locations
+US +384038-0873143 America/Indiana/Vincennes Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
US +411745-0863730 America/Indiana/Knox Eastern Time - Indiana - Starke County
US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana - Pulaski County
US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County
US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana - Switzerland County
US +415100-0873900 America/Chicago Central Time
-US +384038-0873143 America/Indiana/Vincennes Central Time - Indiana - Daviess, Dubois, Knox, Martin & Perry Counties
+US +375711-0864541 America/Indiana/Tell_City Central Time - Indiana - Perry County
US +382931-0871643 America/Indiana/Petersburg Central Time - Indiana - Pike County
US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County
==== //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_vsc8211.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.2 2007/05/28 22:57:26 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_vsc8211.c,v 1.3 2007/08/25 21:07:37 kmacy Exp $");
#ifdef CONFIG_DEFINED
#include <cxgb_include.h>
@@ -248,4 +248,5 @@
const struct mdio_ops *mdio_ops)
{
cphy_init(phy, adapter, phy_addr, &vsc8211_ops, mdio_ops);
+ t3_os_sleep(20); /* PHY needs ~10ms to start responding to MDIO */
}
==== //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_adapter.h#6 (text+ko) ====
@@ -26,7 +26,7 @@
POSSIBILITY OF SUCH DAMAGE.
-$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.16 2007/08/17 05:57:03 kmacy Exp $
+$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.17 2007/08/25 21:07:36 kmacy Exp $
***************************************************************************/
@@ -36,7 +36,7 @@
#define _CXGB_ADAPTER_H_
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.16 2007/08/17 05:57:03 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.17 2007/08/25 21:07:36 kmacy Exp $");
#include <sys/lock.h>
#include <sys/mutex.h>
@@ -117,10 +117,13 @@
#else
struct mtx lock;
#endif
- int port_id;
- uint8_t hw_addr[ETHER_ADDR_LEN];
+ uint8_t port_id;
+ uint8_t tx_chan;
+ uint8_t txpkt_intf;
uint8_t nqsets;
uint8_t first_qset;
+
+ uint8_t hw_addr[ETHER_ADDR_LEN];
struct taskqueue *tq;
struct task start_task;
struct task timer_reclaim_task;
@@ -515,7 +518,7 @@
void t3_rx_eth_lro(adapter_t *adap, struct sge_rspq *rq, struct mbuf *m,
int ethpad, uint32_t rss_hash, uint32_t rss_csum, int lro);
-void t3_rx_eth(struct port_info *p, struct sge_rspq *rq, struct mbuf *m, int ethpad);
+void t3_rx_eth(struct adapter *adap, struct sge_rspq *rq, struct mbuf *m, int ethpad);
void t3_lro_flush(adapter_t *adap, struct sge_qset *qs, struct lro_state *state);
void t3_add_sysctls(adapter_t *sc);
==== //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_lro.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.7 2007/06/13 05:35:59 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.8 2007/08/25 21:07:36 kmacy Exp $");
#include <sys/param.h>
@@ -199,7 +199,7 @@
MBUF_HEADER_CHECK(sm);
sm->m_flags |= M_LRO;
- t3_rx_eth(qs->port, &qs->rspq, sm, 2);
+ t3_rx_eth(qs->port->adapter, &qs->rspq, sm, 2);
if (m) {
s->head = m;
@@ -341,7 +341,6 @@
struct ip *ih;
struct tcphdr *th;
struct t3_lro_session *s = NULL;
- struct port_info *pi = qs->port;
if (lro == 0)
goto no_lro;
@@ -349,9 +348,6 @@
if (!can_lro_packet(cpl, rss_csum))
goto no_lro;
- if (&adap->port[cpl->iff] != pi)
- panic("bad port index %d\n", cpl->iff);
-
ih = (struct ip *)(eh + 1);
th = (struct tcphdr *)(ih + 1);
@@ -366,9 +362,11 @@
if (lro_update_session(s, m)) {
lro_flush_session(qs, s, m);
}
+#ifdef notyet
if (__predict_false(s->head->m_pkthdr.len + pi->ifp->if_mtu > 65535)) {
lro_flush_session(qs, s, NULL);
- }
+ }
+#endif
}
qs->port_stats[SGE_PSTATS_LRO_QUEUED]++;
@@ -380,7 +378,8 @@
if (m->m_len == 0 || m->m_pkthdr.len == 0 || (m->m_flags & M_PKTHDR) == 0)
DPRINTF("rx_eth_lro mbuf len=%d pktlen=%d flags=0x%x\n",
m->m_len, m->m_pkthdr.len, m->m_flags);
- t3_rx_eth(pi, rq, m, ethpad);
+
+ t3_rx_eth(adap, rq, m, ethpad);
}
void
==== //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_main.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.31 2007/08/17 05:57:04 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.32 2007/08/25 21:07:36 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,6 +113,8 @@
static void cxgb_get_regs(adapter_t *sc, struct ifconf_regs *regs, uint8_t *buf);
static int cxgb_get_regs_len(void);
static int offload_open(struct port_info *pi);
+static void touch_bars(device_t dev);
+
#ifdef notyet
static int offload_close(struct toedev *tdev);
#endif
@@ -412,7 +414,8 @@
"PCIe x%d Link, expect reduced performance\n",
sc->link_width);
}
-
+
+ touch_bars(dev);
pci_enable_busmaster(dev);
/*
* Allocate the registers and make them available to the driver.
@@ -551,17 +554,23 @@
* will be done in these children.
*/
for (i = 0; i < (sc)->params.nports; i++) {
+ struct port_info *pi;
+
if ((child = device_add_child(dev, "cxgb", -1)) == NULL) {
device_printf(dev, "failed to add child port\n");
error = EINVAL;
goto out;
}
- sc->port[i].adapter = sc;
- sc->port[i].nqsets = port_qsets;
- sc->port[i].first_qset = i*port_qsets;
- sc->port[i].port_id = i;
+ pi = &sc->port[i];
+ pi->adapter = sc;
+ pi->nqsets = port_qsets;
+ pi->first_qset = i*port_qsets;
+ pi->port_id = i;
+ pi->tx_chan = i >= ai->nports0;
+ pi->txpkt_intf = pi->tx_chan ? 2 * (i - ai->nports0) + 1 : 2 * i;
+ sc->rxpkt_map[pi->txpkt_intf] = i;
sc->portdev[i] = child;
- device_set_softc(child, &sc->port[i]);
+ device_set_softc(child, pi);
}
if ((error = bus_generic_attach(dev)) != 0)
goto out;
@@ -633,22 +642,25 @@
sc->msix_regs_res);
}
- t3_sge_deinit_sw(sc);
-
if (sc->tq != NULL) {
taskqueue_drain(sc->tq, &sc->ext_intr_task);
taskqueue_drain(sc->tq, &sc->tick_task);
- taskqueue_free(sc->tq);
- }
+ }
+ t3_sge_deinit_sw(sc);
+ /*
+ * Wait for last callout
+ */
+
+ tsleep(&sc, 0, "cxgb unload", 3*hz);
- tsleep(&sc, 0, "cxgb unload", hz);
-
for (i = 0; i < (sc)->params.nports; ++i) {
if (sc->portdev[i] != NULL)
device_delete_child(sc->dev, sc->portdev[i]);
}
bus_generic_detach(sc->dev);
+ if (sc->tq != NULL)
+ taskqueue_free(sc->tq);
#ifdef notyet
if (is_offload(sc)) {
cxgb_adapter_unofld(sc);
@@ -804,16 +816,19 @@
else
irq_idx = 0;
- for (qset_idx = 0, i = 0; i < (sc)->params.nports; ++i) {
+ for (qset_idx = 0, i = 0; i < (sc)->params.nports; i++) {
struct port_info *pi = &sc->port[i];
- for (j = 0; j < pi->nqsets; ++j, ++qset_idx) {
+ for (j = 0; j < pi->nqsets; j++, qset_idx++) {
+ printf("allocating qset_idx=%d for port_id=%d\n",
+ qset_idx, pi->port_id);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list