From owner-p4-projects@FreeBSD.ORG  Wed May 16 17:26:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 08EA016A402; Wed, 16 May 2007 17:26:45 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AAC1B16A401
	for <perforce@freebsd.org>; Wed, 16 May 2007 17:26:44 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BF8513C44B
	for <perforce@freebsd.org>; Wed, 16 May 2007 17:26:44 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GHQiit041471
	for <perforce@freebsd.org>; Wed, 16 May 2007 17:26:44 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GHQiC6041462
	for perforce@freebsd.org; Wed, 16 May 2007 17:26:44 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 16 May 2007 17:26:44 GMT
Message-Id: <200705161726.l4GHQiC6041462@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>
Cc: 
Subject: PERFORCE change 119918 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 16 May 2007 17:26:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=119918

Change 119918 by jhb@jhb_mutex on 2007/05/16 17:26:36

	Make BPF_CHECK_DIRECTION not contain if, but just test the condition.
	Also, invert it's sense so it reads better (it returns true if the
	direction is ok and false if the packet should be skipped).

Affected files ...

.. //depot/projects/smpng/sys/net/bpf.c#68 edit

Differences ...

==== //depot/projects/smpng/sys/net/bpf.c#68 (text+ko) ====

@@ -1321,8 +1321,8 @@
 }
 
 #define	BPF_CHECK_DIRECTION(d, m) \
-	if (((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif == NULL) || \
-	    ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif != NULL))
+	(((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif != NULL) || \
+	 ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif == NULL))
 
 /*
  * Incoming linkage from device drivers, when packet is in an mbuf chain.
@@ -1346,7 +1346,7 @@
 
 	BPFIF_LOCK(bp);
 	LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
-		BPF_CHECK_DIRECTION(d, m)
+		if (!BPF_CHECK_DIRECTION(d, m))
 			continue;
 		BPFD_LOCK(d);
 		++d->bd_rcount;
@@ -1409,7 +1409,7 @@
 
 	BPFIF_LOCK(bp);
 	LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
-		BPF_CHECK_DIRECTION(d, m)
+		if (!BPF_CHECK_DIRECTION(d, m))
 			continue;
 		BPFD_LOCK(d);
 		++d->bd_rcount;