From owner-svn-src-stable@FreeBSD.ORG  Tue Aug 25 17:00:25 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 271661065698;
	Tue, 25 Aug 2009 17:00:25 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 154A68FC74;
	Tue, 25 Aug 2009 17:00:25 +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 n7PH0OmQ034161;
	Tue, 25 Aug 2009 17:00:24 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7PH0ON0034159;
	Tue, 25 Aug 2009 17:00:24 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200908251700.n7PH0ON0034159@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Tue, 25 Aug 2009 17:00:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196548 - in stable/7/sys: . contrib/pf netipsec
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Aug 2009 17:00:25 -0000

Author: bz
Date: Tue Aug 25 17:00:24 2009
New Revision: 196548
URL: http://svn.freebsd.org/changeset/base/196548

Log:
  MFC r187936:
  
    Use NULL rather than 0 when comparing pointers.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/netipsec/ipsec_output.c

Modified: stable/7/sys/netipsec/ipsec_output.c
==============================================================================
--- stable/7/sys/netipsec/ipsec_output.c	Tue Aug 25 16:59:55 2009	(r196547)
+++ stable/7/sys/netipsec/ipsec_output.c	Tue Aug 25 17:00:24 2009	(r196548)
@@ -782,14 +782,14 @@ ipsec6_output_tunnel(struct ipsec_output
 			RTFREE(state->ro->ro_rt);
 			state->ro->ro_rt = NULL;
 		}
-		if (state->ro->ro_rt == 0) {
+		if (state->ro->ro_rt == NULL) {
 			bzero(dst6, sizeof(*dst6));
 			dst6->sin6_family = AF_INET6;
 			dst6->sin6_len = sizeof(*dst6);
 			dst6->sin6_addr = ip6->ip6_dst;
 			rtalloc(state->ro);
 		}
-		if (state->ro->ro_rt == 0) {
+		if (state->ro->ro_rt == NULL) {
 			ip6stat.ip6s_noroute++;
 			ipsec6stat.ips_out_noroute++;
 			error = EHOSTUNREACH;