From owner-svn-src-projects@freebsd.org Tue Sep 29 21:16:36 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81301A0C780 for ; Tue, 29 Sep 2015 21:16:36 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.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 6F7301EA4; Tue, 29 Sep 2015 21:16:36 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8TLGa1K084725; Tue, 29 Sep 2015 21:16:36 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8TLGaf5084724; Tue, 29 Sep 2015 21:16:36 GMT (envelope-from np@FreeBSD.org) Message-Id: <201509292116.t8TLGaf5084724@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 29 Sep 2015 21:16:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r288395 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei 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.20 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: Tue, 29 Sep 2015 21:16:36 -0000 Author: np Date: Tue Sep 29 21:16:35 2015 New Revision: 288395 URL: https://svnweb.freebsd.org/changeset/base/288395 Log: Use the base driver's malloc type instead of creating a new one. Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Sep 29 21:07:33 2015 (r288394) +++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Sep 29 21:16:35 2015 (r288395) @@ -64,6 +64,8 @@ __FBSDID("$FreeBSD$"); #include #include #include + +#include "common/common.h" #include "cxgbei.h" SYSCTL_NODE(_kern_icl, OID_AUTO, cxgbei, CTLFLAG_RD, 0, "Chelsio iSCSI offload"); @@ -81,7 +83,6 @@ static int recvspace = 1048576; SYSCTL_INT(_kern_icl_cxgbei, OID_AUTO, recvspace, CTLFLAG_RWTUN, &recvspace, 0, "Default receive socket buffer size"); -static MALLOC_DEFINE(M_ICL_CXGBEI, "icl_cxgbei", "iSCSI software backend"); static uma_zone_t icl_pdu_zone; static uma_zone_t icl_transfer_zone; @@ -419,7 +420,7 @@ icl_cxgbei_new_conn(const char *name, st refcount_acquire(&icl_ncons); - ic = (struct icl_conn *)kobj_create(&icl_cxgbei_class, M_ICL_CXGBEI, M_WAITOK | M_ZERO); + ic = (struct icl_conn *)kobj_create(&icl_cxgbei_class, M_CXGBE, M_WAITOK | M_ZERO); STAILQ_INIT(&ic->ic_to_send); ic->ic_lock = lock; @@ -441,7 +442,7 @@ icl_cxgbei_conn_free(struct icl_conn *ic cv_destroy(&ic->ic_send_cv); cv_destroy(&ic->ic_receive_cv); - kobj_delete((struct kobj *)ic, M_ICL_CXGBEI); + kobj_delete((struct kobj *)ic, M_CXGBE); refcount_release(&icl_ncons); }