From owner-p4-projects@FreeBSD.ORG  Thu Jun 10 20:55:10 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75229106583A; Thu, 10 Jun 2010 20:55:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC7641065722
	for <perforce@freebsd.org>; Thu, 10 Jun 2010 20:55:09 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 82C748FC19
	for <perforce@freebsd.org>; Thu, 10 Jun 2010 20:55:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5AKt8E4077220
	for <perforce@freebsd.org>; Thu, 10 Jun 2010 20:55:08 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5AKt8Id077218
	for perforce@freebsd.org; Thu, 10 Jun 2010 20:55:08 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 10 Jun 2010 20:55:08 GMT
Message-Id: <201006102055.o5AKt8Id077218@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179439 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jun 2010 20:55:10 -0000

http://p4web.freebsd.org/@@179439?ac=10

Change 179439 by jhb@jhb_jhbbsd on 2010/06/10 20:54:36

	IFC @179437

Affected files ...

.. //depot/projects/smpng/sys/net80211/ieee80211_hwmp.c#7 integrate

Differences ...

==== //depot/projects/smpng/sys/net80211/ieee80211_hwmp.c#7 (text+ko) ====

@@ -28,7 +28,7 @@
  */ 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_hwmp.c,v 1.11 2010/06/01 14:13:59 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_hwmp.c,v 1.12 2010/06/10 20:40:38 rpaulo Exp $");
 #endif
 
 /*
@@ -707,9 +707,10 @@
 	rtorig = ieee80211_mesh_rt_find(vap, preq->preq_origaddr);
 	if (rtorig == NULL)
 		rtorig = ieee80211_mesh_rt_add(vap, preq->preq_origaddr);
-	if (rtorig == NULL)
+	if (rtorig == NULL) {
 		/* XXX stat */
 		return;
+	}
 	hrorig = IEEE80211_MESH_ROUTE_PRIV(rtorig, struct ieee80211_hwmp_route);
 	/*
 	 * Sequence number validation.