From owner-svn-src-all@FreeBSD.ORG  Wed Oct 13 17:09:17 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0FAC91065672;
	Wed, 13 Oct 2010 17:09:17 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F29358FC18;
	Wed, 13 Oct 2010 17:09:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9DH9GCG094088;
	Wed, 13 Oct 2010 17:09:16 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9DH9G2j094086;
	Wed, 13 Oct 2010 17:09:16 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201010131709.o9DH9G2j094086@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 13 Oct 2010 17:09:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213788 - head/sys/contrib/ngatm/netnatm/api
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Oct 2010 17:09:17 -0000

Author: rpaulo
Date: Wed Oct 13 17:09:16 2010
New Revision: 213788
URL: http://svn.freebsd.org/changeset/base/213788

Log:
  Fix several cases were a conditional operator was used instead of a
  bitwise operator.
  
  Found with:	clang

Modified:
  head/sys/contrib/ngatm/netnatm/api/cc_conn.c

Modified: head/sys/contrib/ngatm/netnatm/api/cc_conn.c
==============================================================================
--- head/sys/contrib/ngatm/netnatm/api/cc_conn.c	Wed Oct 13 17:06:25 2010	(r213787)
+++ head/sys/contrib/ngatm/netnatm/api/cc_conn.c	Wed Oct 13 17:09:16 2010	(r213788)
@@ -977,25 +977,25 @@ cc_conn_sig_handle(struct ccconn *conn, 
 		/*
 		 * attributes
 		 */
-		if (conn->dirty_attr && CCDIRTY_AAL)
+		if (conn->dirty_attr & CCDIRTY_AAL)
 			resp->connect.aal = conn->aal;
-		if (conn->dirty_attr && CCDIRTY_BLLI)
+		if (conn->dirty_attr & CCDIRTY_BLLI)
 			resp->connect.blli =
 			    conn->blli[conn->blli_selector - 1];
-		if (conn->dirty_attr && CCDIRTY_CONNID)
+		if (conn->dirty_attr & CCDIRTY_CONNID)
 			resp->connect.connid = conn->connid;
 		/* XXX NOTIFY */
-		if (conn->dirty_attr && CCDIRTY_EETD)
+		if (conn->dirty_attr & CCDIRTY_EETD)
 			resp->connect.eetd = conn->eetd;
 		/* XXX GIT */
 		/* XXX UU */
-		if (conn->dirty_attr && CCDIRTY_TRAFFIC)
+		if (conn->dirty_attr & CCDIRTY_TRAFFIC)
 			resp->connect.traffic = conn->traffic;
-		if (conn->dirty_attr && CCDIRTY_EXQOS)
+		if (conn->dirty_attr & CCDIRTY_EXQOS)
 			resp->connect.exqos = conn->exqos;
-		if (conn->dirty_attr && CCDIRTY_ABRSETUP)
+		if (conn->dirty_attr & CCDIRTY_ABRSETUP)
 			resp->connect.abrsetup = conn->abrsetup;
-		if (conn->dirty_attr && CCDIRTY_ABRADD)
+		if (conn->dirty_attr & CCDIRTY_ABRADD)
 			resp->connect.abradd = conn->abradd;
 
 		/*