PERFORCE change 149164 for review
Brooks Davis
brooks at FreeBSD.org
Wed Sep 3 22:18:20 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=149164
Change 149164 by brooks at brooks_coredump on 2008/09/03 22:17:46
IFC
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/adm5120/std.adm5120#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/conf/ADM5120#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/conf/IDT#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/conf/SENTRY5#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/idt/std.idt#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/malta/files.malta#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/malta/std.malta#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/in_cksum.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/exception.S#4 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c,v 1.2 2008/09/03 19:23:01 julian Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,7 @@
#include <sys/taskqueue.h>
#include <sys/proc.h>
#include <sys/eventhandler.h>
+#include <sys/vimage.h>
#include <net/if.h>
#include <net/if_var.h>
@@ -237,7 +238,7 @@
/* Register existing TOE interfaces by walking the ifnet chain */
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
(void)ifaddr_event_handler(NULL, ifp);
}
IFNET_RUNLOCK();
==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs.h#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* $NetBSD: tmpfs.h,v 1.26 2007/02/22 06:37:00 thorpej Exp $ */
-/*
+/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/fs/tmpfs/tmpfs.h,v 1.13 2008/04/16 11:33:30 kib Exp $
+ * $FreeBSD: src/sys/fs/tmpfs/tmpfs.h,v 1.14 2008/09/03 18:53:48 delphij Exp $
*/
#ifndef _FS_TMPFS_TMPFS_H_
==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* $NetBSD: tmpfs_fifoops.c,v 1.5 2005/12/11 12:24:29 christos Exp $ */
-/*
+/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
* tmpfs vnode interface for named pipes.
*/
#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.c,v 1.3 2007/06/28 02:39:31 delphij Exp $");
+ __FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.c,v 1.4 2008/09/03 18:53:48 delphij Exp $");
#include <sys/param.h>
#include <sys/filedesc.h>
==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* $NetBSD: tmpfs_fifoops.h,v 1.4 2005/12/03 17:34:44 christos Exp $ */
-/*
+/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.h,v 1.3 2007/06/28 02:36:41 delphij Exp $
+ * $FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.h,v 1.4 2008/09/03 18:53:48 delphij Exp $
*/
#ifndef _FS_TMPFS_TMPFS_FIFOOPS_H_
==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#3 (text+ko) ====
@@ -1,6 +1,6 @@
/* $NetBSD: tmpfs_subr.c,v 1.35 2007/07/09 21:10:50 ad Exp $ */
-/*
+/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
* Efficient memory file system supporting functions.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.17 2008/06/15 18:40:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.18 2008/09/03 18:53:48 delphij Exp $");
#include <sys/param.h>
#include <sys/namei.h>
==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 (text+ko) ====
@@ -1,6 +1,6 @@
/* $NetBSD: tmpfs_vfsops.c,v 1.10 2005/12/11 12:24:29 christos Exp $ */
-/*
+/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -48,7 +41,7 @@
* allocate and release resources.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.19 2008/08/28 15:23:18 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.20 2008/09/03 18:53:48 delphij Exp $");
#include <sys/param.h>
#include <sys/limits.h>
==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#3 (text+ko) ====
@@ -1,6 +1,6 @@
/* $NetBSD: tmpfs_vnops.c,v 1.39 2007/07/23 15:41:01 jmmv Exp $ */
-/*
+/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
* tmpfs vnode interface.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.19 2008/08/28 15:23:18 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.20 2008/09/03 18:53:48 delphij Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
==== //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.h#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* $NetBSD: tmpfs_vnops.h,v 1.7 2005/12/03 17:34:44 christos Exp $ */
-/*
+/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.h,v 1.2 2007/06/28 02:36:41 delphij Exp $
+ * $FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.h,v 1.3 2008/09/03 18:53:48 delphij Exp $
*/
#ifndef _FS_TMPFS_TMPFS_VNOPS_H_
==== //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#6 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.290 2008/08/31 14:26:08 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.291 2008/09/03 19:09:47 simon Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -1848,7 +1848,8 @@
}
if (*t != NULL)
continue;
- sprintf(errmsg, "mount option <%s> is unknown", p);
+ snprintf(errmsg, sizeof(errmsg),
+ "mount option <%s> is unknown", p);
printf("%s\n", errmsg);
ret = EINVAL;
}
==== //depot/projects/vimage-commit2/src/sys/mips/adm5120/std.adm5120#2 (text+ko) ====
@@ -1,8 +1,9 @@
-# $FreeBSD: src/sys/mips/adm5120/std.adm5120,v 1.1 2008/07/06 21:09:29 imp Exp $
+# $FreeBSD: src/sys/mips/adm5120/std.adm5120,v 1.2 2008/09/03 18:49:54 obrien Exp $
# Standard include file for ADM5120
+files "../adm5120/files.adm5120"
+
cpu CPU_MIPS4KC
-files "../mips32/adm5120/files.adm5120"
options ISA_MIPS32
# device admpci
==== //depot/projects/vimage-commit2/src/sys/mips/conf/ADM5120#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.3 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.4 2008/09/03 18:49:54 obrien Exp $
machine mips
ident ADM5120
@@ -27,7 +27,7 @@
makeoptions MODULES_OVERRIDE=""
options KERNVIRTADDR=0x80100000
-include "../mips32/adm5120/std.adm5120"
+include "../adm5120/std.adm5120"
hints "ADM5120.hints" #Default places to look for devices.
==== //depot/projects/vimage-commit2/src/sys/mips/conf/IDT#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/mips/conf/IDT,v 1.3 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/mips/conf/IDT,v 1.4 2008/09/03 18:49:54 obrien Exp $
machine mips
cpu CPU_MIPS4KC
@@ -7,7 +7,7 @@
# Don't build any modules yet.
makeoptions MODULES_OVERRIDE=""
-include "../mips32/idt/std.idt"
+include "../idt/std.idt"
hints "IDT.hints" #Default places to look for devices.
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
==== //depot/projects/vimage-commit2/src/sys/mips/conf/MALTA#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/mips/conf/MALTA,v 1.3 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/mips/conf/MALTA,v 1.4 2008/09/03 18:40:29 obrien Exp $
machine mips
ident MALTA
@@ -32,7 +32,7 @@
options TICK_USE_YAMON_FREQ=defined
#options TICK_USE_MALTA_RTC=defined
-include "../mips32/malta/std.malta"
+include "../malta/std.malta"
hints "MALTA.hints" #Default places to look for devices.
==== //depot/projects/vimage-commit2/src/sys/mips/conf/SENTRY5#2 (text) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.3 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.4 2008/09/03 18:49:54 obrien Exp $
#
# The Broadcom Sentry5 series of processors and boards is very commonly
# used in COTS hardware including the Netgear WGT634U.
@@ -34,7 +34,7 @@
# XXX only siba should be hardwired for now; we will use
# bus enumeration there
-files "../mips32/sentry5/files.sentry5"
+files "../sentry5/files.sentry5"
hints "SENTRY5.hints"
# sentry5 normally ships with cfe firmware; use the console for now
==== //depot/projects/vimage-commit2/src/sys/mips/idt/std.idt#2 (text+ko) ====
@@ -1,5 +1,6 @@
-# $FreeBSD: src/sys/mips/idt/std.idt,v 1.1 2008/07/06 21:09:29 imp Exp $
+# $FreeBSD: src/sys/mips/idt/std.idt,v 1.2 2008/09/03 18:49:54 obrien Exp $
# Standard include file for IDT
-files "../mips32/idt/files.idt"
+files "../idt/files.idt"
+
options ISA_MIPS32
==== //depot/projects/vimage-commit2/src/sys/mips/malta/files.malta#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/mips/malta/files.malta,v 1.1 2008/07/06 21:09:29 imp Exp $
+# $FreeBSD: src/sys/mips/malta/files.malta,v 1.2 2008/09/03 18:40:02 obrien Exp $
mips/malta/gt.c standard
mips/malta/gt_pci.c standard
mips/malta/obio.c optional uart
-mips/malta/uart_cpu_maltausart.c optional uart
-mips/malta/uart_bus_maltausart.c optional uart
-dev/uart/uart_dev_ns8250.c optional uart
+mips/malta/uart_cpu_maltausart.c optional uart
+mips/malta/uart_bus_maltausart.c optional uart
+dev/uart/uart_dev_ns8250.c optional uart
mips/malta/malta_machdep.c standard
mips/malta/yamon.c standard
==== //depot/projects/vimage-commit2/src/sys/mips/malta/std.malta#2 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/mips/malta/std.malta,v 1.1 2008/07/06 21:09:29 imp Exp $
-files "../mips32/malta/files.malta"
+# $FreeBSD: src/sys/mips/malta/std.malta,v 1.2 2008/09/03 18:40:29 obrien Exp $
+files "../malta/files.malta"
cpu CPU_MIPS4KC
options ISA_MIPS32
==== //depot/projects/vimage-commit2/src/sys/mips/mips/in_cksum.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/mips/mips/in_cksum.c,v 1.1 2008/04/13 07:27:37 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/mips/mips/in_cksum.c,v 1.2 2008/09/03 18:40:02 obrien Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -104,9 +104,9 @@
union q_util q_util;
if ((3 & (long) lw) == 0 && len == 20) {
- sum = (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3] + lw[4];
- REDUCE32;
- return sum;
+ sum = (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3] + lw[4];
+ REDUCE32;
+ return sum;
}
if ((offset = 3 & (long) lw) != 0) {
@@ -190,7 +190,7 @@
u_int64_t sum;
union q_util q_util;
union l_util l_util;
-
+
sum = (u_int64_t) a + b + c;
REDUCE16;
return (sum);
@@ -206,16 +206,16 @@
union q_util q_util;
union l_util l_util;
- len -= skip;
- for (; skip && m; m = m->m_next) {
- if (m->m_len > skip) {
- mlen = m->m_len - skip;
+ len -= skip;
+ for (; skip && m; m = m->m_next) {
+ if (m->m_len > skip) {
+ mlen = m->m_len - skip;
addr = mtod(m, caddr_t) + skip;
- goto skip_start;
- } else {
- skip -= m->m_len;
- }
- }
+ goto skip_start;
+ } else {
+ skip -= m->m_len;
+ }
+ }
for (; m && len; m = m->m_next) {
if (m->m_len == 0)
@@ -227,9 +227,9 @@
mlen = len;
if ((clen ^ (int) addr) & 1)
- sum += in_cksumdata(addr, mlen) << 8;
+ sum += in_cksumdata(addr, mlen) << 8;
else
- sum += in_cksumdata(addr, mlen);
+ sum += in_cksumdata(addr, mlen);
clen += mlen;
len -= mlen;
@@ -240,9 +240,9 @@
u_int in_cksum_hdr(const struct ip *ip)
{
- u_int64_t sum = in_cksumdata(ip, sizeof(struct ip));
- union q_util q_util;
- union l_util l_util;
- REDUCE16;
- return (~sum & 0xffff);
+ u_int64_t sum = in_cksumdata(ip, sizeof(struct ip));
+ union q_util q_util;
+ union l_util l_util;
+ REDUCE16;
+ return (~sum & 0xffff);
}
==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#9 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.54 2008/09/02 04:49:35 weongyo Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.55 2008/09/03 20:33:11 brooks Exp $");
/*
* IEEE 802.11 generic handler
==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#12 (text+ko) ====
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.90 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.91 2008/09/03 19:09:47 simon Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1130,6 +1130,15 @@
if (!validated)
return;
+ /*
+ * In case the suggested mtu is less than IPV6_MMTU, we
+ * only need to remember that it was for above mentioned
+ * "alwaysfrag" case.
+ * Try to be as close to the spec as possible.
+ */
+ if (mtu < IPV6_MMTU)
+ mtu = IPV6_MMTU - 8;
+
bzero(&inc, sizeof(inc));
inc.inc_flags = 1; /* IPv6 */
inc.inc6_faddr = *dst;
==== //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/exception.S#4 (text+ko) ====
@@ -54,7 +54,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/exception.S,v 1.77 2008/08/22 20:28:19 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/exception.S,v 1.78 2008/09/03 21:48:12 marius Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -550,7 +550,7 @@
tl ## traplvl ## _intr level, 1 << level
#define TICK(traplvl) \
- tl ## traplvl ## _intr PIL_TICK, 1
+ tl ## traplvl ## _intr PIL_TICK, 0x10001
#define INTR_LEVEL(tl) \
INTR(1, tl) ; \
More information about the p4-projects
mailing list