From a7012295b46ac552b2d7b74aabb66fab2eaede21 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 30 Sep 2003 09:06:58 +0000
Subject: [PATCH] Reduce diffs against KAME.  No functional change.

Obtained from:	KAME
---
 sys/netkey/key_debug.h |  2 +-
 sys/netkey/keysock.c   | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/sys/netkey/key_debug.h b/sys/netkey/key_debug.h
index 0bfdbba884a..215b9d9d149 100644
--- a/sys/netkey/key_debug.h
+++ b/sys/netkey/key_debug.h
@@ -1,5 +1,5 @@
 /*	$FreeBSD$	*/
-/*	$KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $	*/
+/*	$KAME: key_debug.h,v 1.11 2002/11/05 03:48:34 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index 923cce7dc10..ec71540558e 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -286,15 +286,11 @@ key_sendup_mbuf(so, m, target)
 	pfkeystat.in_total++;
 	pfkeystat.in_bytes += m->m_pkthdr.len;
 	if (m->m_len < sizeof(struct sadb_msg)) {
-#if 1
 		m = m_pullup(m, sizeof(struct sadb_msg));
 		if (m == NULL) {
 			pfkeystat.in_nomem++;
 			return ENOBUFS;
 		}
-#else
-		/* don't bother pulling it up just for stats */
-#endif
 	}
 	if (m->m_len >= sizeof(struct sadb_msg)) {
 		struct sadb_msg *msg;
@@ -302,12 +298,11 @@ key_sendup_mbuf(so, m, target)
 		pfkeystat.in_msgtype[msg->sadb_msg_type]++;
 	}
 
-	LIST_FOREACH(rp, &rawcb_list, list)
-	{
+	LIST_FOREACH(rp, &rawcb_list, list) {
 		if (rp->rcb_proto.sp_family != PF_KEY)
 			continue;
-		if (rp->rcb_proto.sp_protocol
-		 && rp->rcb_proto.sp_protocol != PF_KEY_V2) {
+		if (rp->rcb_proto.sp_protocol &&
+		    rp->rcb_proto.sp_protocol != PF_KEY_V2) {
 			continue;
 		}