From owner-svn-src-head@FreeBSD.ORG  Sun Nov 14 14:37:20 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F01C8106564A;
	Sun, 14 Nov 2010 14:37:20 +0000 (UTC)
	(envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DDD148FC0A;
	Sun, 14 Nov 2010 14:37:20 +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 oAEEbKkk084734;
	Sun, 14 Nov 2010 14:37:20 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAEEbK3Z084732;
	Sun, 14 Nov 2010 14:37:20 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201011141437.oAEEbK3Z084732@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sun, 14 Nov 2010 14:37:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215301 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Nov 2010 14:37:21 -0000

Author: tuexen
Date: Sun Nov 14 14:37:20 2010
New Revision: 215301
URL: http://svn.freebsd.org/changeset/base/215301

Log:
  Simplify sctp_delayed_cksum() a bit.
  
  MFC after: 3 days.

Modified:
  head/sys/netinet/sctp_crc32.c

Modified: head/sys/netinet/sctp_crc32.c
==============================================================================
--- head/sys/netinet/sctp_crc32.c	Sun Nov 14 14:25:04 2010	(r215300)
+++ head/sys/netinet/sctp_crc32.c	Sun Nov 14 14:37:20 2010	(r215301)
@@ -124,18 +124,16 @@ sctp_delayed_cksum(struct mbuf *m, uint3
 #if defined(SCTP_WITH_NO_CSUM)
 	panic("sctp_delayed_cksum() called when using no SCTP CRC.");
 #else
-	struct ip *ip;
 	uint32_t checksum;
 
-	ip = mtod(m, struct ip *);
 	checksum = sctp_calculate_cksum(m, offset);
 	SCTP_STAT_DECR(sctps_sendhwcrc);
 	SCTP_STAT_INCR(sctps_sendswcrc);
 	offset += offsetof(struct sctphdr, checksum);
 
 	if (offset + sizeof(uint32_t) > (uint32_t) (m->m_len)) {
-		printf("delayed m_pullup, m->len: %d  off: %d  p: %d\n",
-		    (uint32_t) m->m_len, offset, ip->ip_p);
+		printf("sctp_delayed_cksum(): m->len: %d,  off: %d.\n",
+		    (uint32_t) m->m_len, offset);
 		/*
 		 * XXX this shouldn't happen, but if it does, the correct
 		 * behavior may be to insert the checksum in the appropriate