From owner-svn-src-stable-9@FreeBSD.ORG  Mon Feb 13 19:41:01 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A983D106564A;
	Mon, 13 Feb 2012 19:41:01 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 982338FC08;
	Mon, 13 Feb 2012 19:41:01 +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 q1DJf1L6058831;
	Mon, 13 Feb 2012 19:41:01 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1DJf1wk058829;
	Mon, 13 Feb 2012 19:41:01 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201202131941.q1DJf1wk058829@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Mon, 13 Feb 2012 19:41:01 +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: r231607 - stable/9/sys/dev/cxgbe/common
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Feb 2012 19:41:01 -0000

Author: np
Date: Mon Feb 13 19:41:01 2012
New Revision: 231607
URL: http://svn.freebsd.org/changeset/base/231607

Log:
  MFC r231592:
  Use the non-sleeping variang of t4_wr_mbox in code that can be called
  with locks held.

Modified:
  stable/9/sys/dev/cxgbe/common/t4_hw.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/cxgbe/common/t4_hw.c
==============================================================================
--- stable/9/sys/dev/cxgbe/common/t4_hw.c	Mon Feb 13 19:36:09 2012	(r231606)
+++ stable/9/sys/dev/cxgbe/common/t4_hw.c	Mon Feb 13 19:41:01 2012	(r231607)
@@ -4314,7 +4314,7 @@ int t4_change_mac(struct adapter *adap, 
 				V_FW_VI_MAC_CMD_IDX(idx));
 	memcpy(p->macaddr, addr, sizeof(p->macaddr));
 
-	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
+	ret = t4_wr_mbox_ns(adap, mbox, &c, sizeof(c), &c);
 	if (ret == 0) {
 		ret = G_FW_VI_MAC_CMD_IDX(ntohs(p->valid_to_idx));
 		if (ret >= FW_CLS_TCAM_NUM_ENTRIES)