From owner-svn-src-all@FreeBSD.ORG Wed Nov 25 18:39:27 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF0261065696; Wed, 25 Nov 2009 18:39:26 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C4C778FC1A; Wed, 25 Nov 2009 18:39:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAPIdQSK058491; Wed, 25 Nov 2009 18:39:26 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAPIdQ46058489; Wed, 25 Nov 2009 18:39:26 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <200911251839.nAPIdQ46058489@svn.freebsd.org> From: Marius Strobl Date: Wed, 25 Nov 2009 18:39:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199811 - in stable/6/sys: . sparc64/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2009 18:39:27 -0000 Author: marius Date: Wed Nov 25 18:39:26 2009 New Revision: 199811 URL: http://svn.freebsd.org/changeset/base/199811 Log: MFC: r198502 Sync with the other archs and wrap the prototype of in_cksum_skip(9) in #ifdef _KERNEL. Submitted by: Ulrich Spoerlein Modified: stable/6/sys/sparc64/include/in_cksum.h Directory Properties: stable/6/sys/ (props changed) stable/6/sys/Makefile (props changed) stable/6/sys/alpha/ (props changed) stable/6/sys/amd64/ (props changed) stable/6/sys/arm/ (props changed) stable/6/sys/boot/ (props changed) stable/6/sys/bsm/ (props changed) stable/6/sys/cam/ (props changed) stable/6/sys/coda/ (props changed) stable/6/sys/compat/ (props changed) stable/6/sys/conf/ (props changed) stable/6/sys/contrib/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/crypto/ (props changed) stable/6/sys/ddb/ (props changed) stable/6/sys/dev/ (props changed) stable/6/sys/dev/cxgb/ (props changed) stable/6/sys/doc/ (props changed) stable/6/sys/fs/ (props changed) stable/6/sys/gdb/ (props changed) stable/6/sys/geom/ (props changed) stable/6/sys/gnu/ (props changed) stable/6/sys/i386/ (props changed) stable/6/sys/i4b/ (props changed) stable/6/sys/ia64/ (props changed) stable/6/sys/isa/ (props changed) stable/6/sys/isofs/ (props changed) stable/6/sys/kern/ (props changed) stable/6/sys/libkern/ (props changed) stable/6/sys/modules/ (props changed) stable/6/sys/net/ (props changed) stable/6/sys/net80211/ (props changed) stable/6/sys/netatalk/ (props changed) stable/6/sys/netatm/ (props changed) stable/6/sys/netgraph/ (props changed) stable/6/sys/netinet/ (props changed) stable/6/sys/netinet6/ (props changed) stable/6/sys/netipsec/ (props changed) stable/6/sys/netipx/ (props changed) stable/6/sys/netkey/ (props changed) stable/6/sys/netnatm/ (props changed) stable/6/sys/netncp/ (props changed) stable/6/sys/netsmb/ (props changed) stable/6/sys/nfs/ (props changed) stable/6/sys/nfs4client/ (props changed) stable/6/sys/nfsclient/ (props changed) stable/6/sys/nfsserver/ (props changed) stable/6/sys/nlm/ (props changed) stable/6/sys/opencrypto/ (props changed) stable/6/sys/pc98/ (props changed) stable/6/sys/pccard/ (props changed) stable/6/sys/pci/ (props changed) stable/6/sys/posix4/ (props changed) stable/6/sys/powerpc/ (props changed) stable/6/sys/rpc/ (props changed) stable/6/sys/security/ (props changed) stable/6/sys/sparc64/ (props changed) stable/6/sys/sys/ (props changed) stable/6/sys/tools/ (props changed) stable/6/sys/ufs/ (props changed) stable/6/sys/vm/ (props changed) stable/6/sys/xdr/ (props changed) Modified: stable/6/sys/sparc64/include/in_cksum.h ============================================================================== --- stable/6/sys/sparc64/include/in_cksum.h Wed Nov 25 18:31:58 2009 (r199810) +++ stable/6/sys/sparc64/include/in_cksum.h Wed Nov 25 18:39:26 2009 (r199811) @@ -164,6 +164,8 @@ in_cksum_hdr(struct ip *ip) return (__ret); } +#ifdef _KERNEL u_short in_cksum_skip(struct mbuf *m, int len, int skip); +#endif #endif /* _MACHINE_IN_CKSUM_H_ */