From owner-svn-src-projects@FreeBSD.ORG Wed Mar 11 06:06:25 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F152493B; Wed, 11 Mar 2015 06:06:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD4902EA; Wed, 11 Mar 2015 06:06:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2B66Pfr096815; Wed, 11 Mar 2015 06:06:25 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2B66PGa096813; Wed, 11 Mar 2015 06:06:25 GMT (envelope-from np@FreeBSD.org) Message-Id: <201503110606.t2B66PGa096813@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Wed, 11 Mar 2015 06:06:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279873 - projects/cxl_iscsi/sys/dev/cxgbe X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2015 06:06:26 -0000 Author: np Date: Wed Mar 11 06:06:24 2015 New Revision: 279873 URL: https://svnweb.freebsd.org/changeset/base/279873 Log: t4_iscsi_init sets up global chip registers. Make sure it doesn't give the impression that it's doing something port or ifnet specific. Modified: projects/cxl_iscsi/sys/dev/cxgbe/offload.h projects/cxl_iscsi/sys/dev/cxgbe/t4_main.c Modified: projects/cxl_iscsi/sys/dev/cxgbe/offload.h ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/offload.h Wed Mar 11 05:54:14 2015 (r279872) +++ projects/cxl_iscsi/sys/dev/cxgbe/offload.h Wed Mar 11 06:06:24 2015 (r279873) @@ -156,7 +156,7 @@ int t4_register_uld(struct uld_info *); int t4_unregister_uld(struct uld_info *); int t4_activate_uld(struct adapter *, int); int t4_deactivate_uld(struct adapter *, int); -void t4_iscsi_init(struct ifnet *, unsigned int, const unsigned int *); +void t4_iscsi_init(struct adapter *, u_int, const u_int *); int uld_active(struct adapter *, int); #endif #endif Modified: projects/cxl_iscsi/sys/dev/cxgbe/t4_main.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/t4_main.c Wed Mar 11 05:54:14 2015 (r279872) +++ projects/cxl_iscsi/sys/dev/cxgbe/t4_main.c Wed Mar 11 06:06:24 2015 (r279873) @@ -8190,11 +8190,8 @@ t4_ioctl(struct cdev *dev, unsigned long #ifdef TCP_OFFLOAD void -t4_iscsi_init(struct ifnet *ifp, unsigned int tag_mask, - const unsigned int *pgsz_order) +t4_iscsi_init(struct adapter *sc, u_int tag_mask, const u_int *pgsz_order) { - struct port_info *pi = ifp->if_softc; - struct adapter *sc = pi->adapter; t4_write_reg(sc, A_ULP_RX_ISCSI_TAGMASK, tag_mask); t4_write_reg(sc, A_ULP_RX_ISCSI_PSZ, V_HPZ0(pgsz_order[0]) |