From owner-svn-src-user@FreeBSD.ORG  Mon Jul 13 01:02:37 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5198A106566C;
	Mon, 13 Jul 2009 01:02:37 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E6B38FC27;
	Mon, 13 Jul 2009 01:02:37 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6D12a3K099789;
	Mon, 13 Jul 2009 01:02:36 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6D12a6U099787;
	Mon, 13 Jul 2009 01:02:36 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200907130102.n6D12a6U099787@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 13 Jul 2009 01:02:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195650 - user/kmacy/head_ppacket/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2009 01:02:37 -0000

Author: kmacy
Date: Mon Jul 13 01:02:36 2009
New Revision: 195650
URL: http://svn.freebsd.org/changeset/base/195650

Log:
  don't RTFREE null rtentry

Modified:
  user/kmacy/head_ppacket/sys/net/if_gre.c

Modified: user/kmacy/head_ppacket/sys/net/if_gre.c
==============================================================================
--- user/kmacy/head_ppacket/sys/net/if_gre.c	Sun Jul 12 23:31:20 2009	(r195649)
+++ user/kmacy/head_ppacket/sys/net/if_gre.c	Mon Jul 13 01:02:36 2009	(r195650)
@@ -217,8 +217,10 @@ gre_clone_create(struct if_clone *ifc, i
 	sc = malloc(sizeof(struct gre_softc), M_GRE, M_WAITOK | M_ZERO);
 
 	GRE2IFP(sc) = ifp = if_alloc(IFT_TUNNEL);
+#ifdef DIAGNOSTIC
 	printf("gre_clone_create: ifp == %p GRE2IFP(sc) == %p\n", ifp,
 	    GRE2IFP(sc));
+#endif
 	if (ifp == NULL) {
 		free(sc, M_GRE);
 		return (ENOSPC);
@@ -889,9 +891,10 @@ gre_compute_route(struct gre_softc *sc)
 	if (ro.ro_rt == NULL || ro.ro_rt->rt_ifp->if_softc == sc) {
 		if (ro.ro_rt == NULL)
 			log(LOG_ERR, " - no route found!\n");
-		else
+		else {
 			log(LOG_ERR, " - route loops back to ourself!\n");
-		RTFREE(ro.ro_rt);
+			RTFREE(ro.ro_rt);
+		}
 		return (EADDRNOTAVAIL);
 	}