From owner-cvs-all@FreeBSD.ORG  Thu Jun  8 23:36:43 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0EB1216A41B;
	Thu,  8 Jun 2006 23:36:43 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9E32B43D73;
	Thu,  8 Jun 2006 23:36:42 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k58NYhQf086923;
	Thu, 8 Jun 2006 23:34:43 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k58NYh35086922;
	Thu, 8 Jun 2006 23:34:43 GMT (envelope-from rwatson)
Message-Id: <200606082334.k58NYh35086922@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 8 Jun 2006 23:34:43 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/netipx spx_usrreq.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 23:36:43 -0000

rwatson     2006-06-08 23:34:43 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netipx           spx_usrreq.c 
  Log:
  Merge spx_usrreq.c:1.81 from HEAD to RELENG_6:
  
    In spx_input(), change a '&&' to a '||', as the spx trace code is able
    to handle a NULL 'cb' here.
  
  Revision   Changes    Path
  1.62.2.17  +1 -1      src/sys/netipx/spx_usrreq.c