From owner-svn-src-stable@FreeBSD.ORG  Thu Jan  5 17:12:21 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24C5F1065672;
	Thu,  5 Jan 2012 17:12:21 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ECD538FC16;
	Thu,  5 Jan 2012 17:12:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q05HCKQj045770;
	Thu, 5 Jan 2012 17:12:20 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05HCK4w045767;
	Thu, 5 Jan 2012 17:12:20 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201051712.q05HCK4w045767@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 5 Jan 2012 17:12:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229601 - in stable/9/sys/dev: ce cp
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 17:12:21 -0000

Author: dim
Date: Thu Jan  5 17:12:20 2012
New Revision: 229601
URL: http://svn.freebsd.org/changeset/base/229601

Log:
  MFC r228963:
  
  Fix clang warnings in sys/dev/ce/if_ce.c and sys/dev/cp/if_cp.c,
  using jkim's last patch (reviewed by bde) from here:
  
  http://docs.freebsd.org/cgi/mid.cgi?201010141558.03154.jkim

Modified:
  stable/9/sys/dev/ce/if_ce.c
  stable/9/sys/dev/cp/if_cp.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/ce/if_ce.c
==============================================================================
--- stable/9/sys/dev/ce/if_ce.c	Thu Jan  5 17:06:04 2012	(r229600)
+++ stable/9/sys/dev/ce/if_ce.c	Thu Jan  5 17:12:20 2012	(r229601)
@@ -1313,9 +1313,11 @@ static int ce_ioctl (struct cdev *dev, u
 			IFP2SP(d->ifp)->pp_flags &= ~(PP_FR);
 			IFP2SP(d->ifp)->pp_flags |= PP_KEEPALIVE;
 			d->ifp->if_flags |= PP_CISCO;
-		} else if (! strcmp ("fr", (char*)data) && PP_FR) {
+#if PP_FR != 0
+		} else if (! strcmp ("fr", (char*)data)) {
 			d->ifp->if_flags &= ~(PP_CISCO);
 			IFP2SP(d->ifp)->pp_flags |= PP_FR | PP_KEEPALIVE;
+#endif
 		} else if (! strcmp ("ppp", (char*)data)) {
 			IFP2SP(d->ifp)->pp_flags &= ~PP_FR;
 			IFP2SP(d->ifp)->pp_flags &= ~PP_KEEPALIVE;

Modified: stable/9/sys/dev/cp/if_cp.c
==============================================================================
--- stable/9/sys/dev/cp/if_cp.c	Thu Jan  5 17:06:04 2012	(r229600)
+++ stable/9/sys/dev/cp/if_cp.c	Thu Jan  5 17:12:20 2012	(r229601)
@@ -1052,9 +1052,11 @@ static int cp_ioctl (struct cdev *dev, u
 			IFP2SP(d->ifp)->pp_flags &= ~(PP_FR);
 			IFP2SP(d->ifp)->pp_flags |= PP_KEEPALIVE;
 			d->ifp->if_flags |= PP_CISCO;
-		} else if (! strcmp ("fr", (char*)data) && PP_FR) {
+#if PP_FR != 0
+		} else if (! strcmp ("fr", (char*)data)) {
 			d->ifp->if_flags &= ~(PP_CISCO);
 			IFP2SP(d->ifp)->pp_flags |= PP_FR | PP_KEEPALIVE;
+#endif
 		} else if (! strcmp ("ppp", (char*)data)) {
 			IFP2SP(d->ifp)->pp_flags &= ~PP_FR;
 			IFP2SP(d->ifp)->pp_flags &= ~PP_KEEPALIVE;