From owner-svn-src-user@FreeBSD.ORG Thu Jun 4 01:45:41 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 10887106566C;
Thu, 4 Jun 2009 01:45:41 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id F34818FC0A;
Thu, 4 Jun 2009 01:45:40 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n541je6Z073163;
Thu, 4 Jun 2009 01:45:40 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n541jeYr073162;
Thu, 4 Jun 2009 01:45:40 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906040145.n541jeYr073162@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 4 Jun 2009 01:45:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r193418 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jun 2009 01:45:41 -0000
Author: kmacy
Date: Thu Jun 4 01:45:40 2009
New Revision: 193418
URL: http://svn.freebsd.org/changeset/base/193418
Log:
always drop PORT_LOCK
Modified:
user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c Thu Jun 4 00:28:18 2009 (r193417)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_main.c Thu Jun 4 01:45:40 2009 (r193418)
@@ -2125,11 +2125,9 @@ cxgb_ioctl(struct ifnet *ifp, unsigned l
} else
cxgb_init_locked(p);
p->if_flags = ifp->if_flags;
- PORT_UNLOCK(p);
- } else if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+ } else if (ifp->if_drv_flags & IFF_DRV_RUNNING)
cxgb_stop_locked(p);
- PORT_UNLOCK(p);
- }
+ PORT_UNLOCK(p);
break;
case SIOCADDMULTI:
case SIOCDELMULTI: