From owner-p4-projects@FreeBSD.ORG  Thu Jul 14 12:27:45 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B8F9106566C; Thu, 14 Jul 2011 12:27:45 +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 1E15B106566B
	for <perforce@FreeBSD.org>; Thu, 14 Jul 2011 12:27:45 +0000 (UTC)
	(envelope-from syuu@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D3CC8FC14
	for <perforce@FreeBSD.org>; Thu, 14 Jul 2011 12:27:45 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6ECRicP035546
	for <perforce@FreeBSD.org>; Thu, 14 Jul 2011 12:27:44 GMT
	(envelope-from syuu@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6ECRiGT035543
	for perforce@freebsd.org; Thu, 14 Jul 2011 12:27:44 GMT
	(envelope-from syuu@FreeBSD.org)
Date: Thu, 14 Jul 2011 12:27:44 GMT
Message-Id: <201107141227.p6ECRiGT035543@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	syuu@FreeBSD.org using -f
From: Takuya ASADA <syuu@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196144 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, 14 Jul 2011 12:27:45 -0000

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

Change 196144 by syuu@kikurage on 2011/07/14 12:27:25

	little fix for flag check

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/net/if.c#4 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/net/if.c#4 (text+ko) ====

@@ -2419,8 +2419,8 @@
 	}
 
 	case SIOCGIFQLEN:
-		if (!ifp->if_capabilities & IFCAP_MULTIQUEUE &&
-		    !ifp->if_capabilities & IFCAP_SOFT_MULTIQUEUE)
+		if (!ifp->if_capabilities & 
+			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))
 			return (EOPNOTSUPP);
 		KASSERT(ifp->if_get_rxqueue_len, ("if_get_rxqueue_len not set"));
 		KASSERT(ifp->if_get_txqueue_len, ("if_get_txqueue_len not set"));
@@ -2429,8 +2429,8 @@
 		break;
 
 	case SIOCGIFRXQAFFINITY:
-		if (!ifp->if_capabilities & IFCAP_MULTIQUEUE &&
-		    !ifp->if_capabilities & IFCAP_SOFT_MULTIQUEUE)
+		if (!ifp->if_capabilities & 
+			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))
 			return (EOPNOTSUPP);
 		KASSERT(ifp->if_get_rxqueue_affinity, ("if_get_rxqueue_affinity not set"));
 		log(LOG_DEBUG, "%s: SIOCGIFRXQAFFINITY ifr_queue_affinity_index:%d\n", __func__, ifr->ifr_queue_affinity_index);
@@ -2439,8 +2439,8 @@
 		break;
 
 	case SIOCGIFTXQAFFINITY:
-		if (!ifp->if_capabilities & IFCAP_MULTIQUEUE &&
-		    !ifp->if_capabilities & IFCAP_SOFT_MULTIQUEUE)
+		if (!ifp->if_capabilities & 
+			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))
 			return (EOPNOTSUPP);
 		KASSERT(ifp->if_get_rxqueue_affinity, ("if_get_rxqueue_affinity not set"));
 		log(LOG_DEBUG, "%s: SIOCGIFTXQAFFINITY ifr_queue_affinity_index:%d\n", __func__, ifr->ifr_queue_affinity_index);