From owner-svn-src-all@FreeBSD.ORG  Fri Apr 27 18:08:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D9C67106564A;
	Fri, 27 Apr 2012 18:08:15 +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 C44698FC0C;
	Fri, 27 Apr 2012 18:08:15 +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 q3RI8FQv018078;
	Fri, 27 Apr 2012 18:08:15 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3RI8FR1018076;
	Fri, 27 Apr 2012 18:08:15 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201204271808.q3RI8FR1018076@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 27 Apr 2012 18:08:15 +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: r234735 - stable/9/sys/dev/nxge
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: Fri, 27 Apr 2012 18:08:16 -0000

Author: dim
Date: Fri Apr 27 18:08:15 2012
New Revision: 234735
URL: http://svn.freebsd.org/changeset/base/234735

Log:
  MFC r234506:
  
  Fix the following compilation warnings in nxge(4):
  
    sys/dev/nxge/if_nxge.c:1276:11: error: case value not in enumerated type 'xge_hal_event_e' (aka 'enum xge_hal_event_e') [-Werror,-Wswitch]
              case XGE_LL_EVENT_TRY_XMIT_AGAIN:
                   ^
    sys/dev/nxge/if_nxge.c:1289:11: error: case value not in enumerated type 'xge_hal_event_e' (aka 'enum xge_hal_event_e') [-Werror,-Wswitch]
              case XGE_LL_EVENT_DEVICE_RESETTING:
                   ^
  
  This is because the switch uses xge_queue_item_t::event_type, which is
  an enum xge_hal_event_e, while the XGE_LL_EVENT_xx values are of the
  enum xge_event_e.
  
  Since messing around with the enum definitions is too disruptive, the
  simplest fix is to cast the argument of the switch to int.
  
  Reviewed by:	gnn

Modified:
  stable/9/sys/dev/nxge/if_nxge.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/nxge/if_nxge.c
==============================================================================
--- stable/9/sys/dev/nxge/if_nxge.c	Fri Apr 27 18:05:24 2012	(r234734)
+++ stable/9/sys/dev/nxge/if_nxge.c	Fri Apr 27 18:08:15 2012	(r234735)
@@ -1272,7 +1272,7 @@ xge_callback_event(xge_queue_item_t *ite
 	lldev  = xge_hal_device_private(hldev);
 	ifnetp = lldev->ifnetp;
 
-	switch(item->event_type) {
+	switch((int)item->event_type) {
 	    case XGE_LL_EVENT_TRY_XMIT_AGAIN:
 	        if(lldev->initialized) {
 	            if(xge_hal_channel_dtr_count(lldev->fifo_channel[0]) > 0) {