From owner-svn-src-head@FreeBSD.ORG Thu May 20 18:22:45 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0C46106566C; Thu, 20 May 2010 18:22:45 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 90BAC8FC14; Thu, 20 May 2010 18:22:45 +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 o4KIMjA6073042; Thu, 20 May 2010 18:22:45 GMT (envelope-from np@svn.freebsd.org) Received: (from np@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4KIMj3W073040; Thu, 20 May 2010 18:22:45 GMT (envelope-from np@svn.freebsd.org) Message-Id: <201005201822.o4KIMj3W073040@svn.freebsd.org> From: Navdeep Parhar Date: Thu, 20 May 2010 18:22:45 +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: r208356 - head/sys/dev/cxgb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2010 18:22:45 -0000 Author: np Date: Thu May 20 18:22:45 2010 New Revision: 208356 URL: http://svn.freebsd.org/changeset/base/208356 Log: Remove invalid assertion. Holding the adapter lock while changing the LRO settings is sufficient. PR: kern/146759 MFC after: 3 days Modified: head/sys/dev/cxgb/cxgb_main.c Modified: head/sys/dev/cxgb/cxgb_main.c ============================================================================== --- head/sys/dev/cxgb/cxgb_main.c Thu May 20 17:30:55 2010 (r208355) +++ head/sys/dev/cxgb/cxgb_main.c Thu May 20 18:22:45 2010 (r208356) @@ -1979,7 +1979,6 @@ cxgb_set_lro(struct port_info *p, int en struct adapter *adp = p->adapter; struct sge_qset *q; - PORT_LOCK_ASSERT_OWNED(p); for (i = 0; i < p->nqsets; i++) { q = &adp->sge.qs[p->first_qset + i]; q->lro.enabled = (enabled != 0);