From owner-svn-soc-all@freebsd.org Thu Aug 13 14:52:15 2015 Return-Path: Delivered-To: svn-soc-all@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 793479A04A5 for ; Thu, 13 Aug 2015 14:52:15 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 6A0B1BC7 for ; Thu, 13 Aug 2015 14:52:15 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7DEqFqq089128 for ; Thu, 13 Aug 2015 14:52:15 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7DEqE36089109 for svn-soc-all@FreeBSD.org; Thu, 13 Aug 2015 14:52:14 GMT (envelope-from stefano@FreeBSD.org) Date: Thu, 13 Aug 2015 14:52:14 GMT Message-Id: <201508131452.t7DEqE36089109@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289691 - soc2015/stefano/ptnetmap/stable/10/sys/dev/cxgbe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2015 14:52:15 -0000 Author: stefano Date: Thu Aug 13 14:52:14 2015 New Revision: 289691 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289691 Log: cxgbe: remove netmap *sync_finalize/prologue() Modified: soc2015/stefano/ptnetmap/stable/10/sys/dev/cxgbe/t4_netmap.c Modified: soc2015/stefano/ptnetmap/stable/10/sys/dev/cxgbe/t4_netmap.c ============================================================================== --- soc2015/stefano/ptnetmap/stable/10/sys/dev/cxgbe/t4_netmap.c Thu Aug 13 14:47:22 2015 (r289690) +++ soc2015/stefano/ptnetmap/stable/10/sys/dev/cxgbe/t4_netmap.c Thu Aug 13 14:52:14 2015 (r289691) @@ -908,8 +908,6 @@ kring->nr_hwtail -= kring->nkr_num_slots; } - nm_txsync_finalize(kring); - return (0); } @@ -922,7 +920,7 @@ struct port_info *pi = ifp->if_softc; struct adapter *sc = pi->adapter; struct sge_nm_rxq *nm_rxq = &sc->sge.nm_rxq[pi->first_nm_rxq + kring->ring_id]; - u_int const head = nm_rxsync_prologue(kring); + u_int const head = kring->rhead; u_int n; int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; @@ -984,8 +982,6 @@ } } - nm_rxsync_finalize(kring); - return (0); }