From owner-svn-src-head@freebsd.org Thu Jun 15 13:24:50 2017 Return-Path: Delivered-To: svn-src-head@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 6B87DD8A722; Thu, 15 Jun 2017 13:24:50 +0000 (UTC) (envelope-from freebsd@omnilan.de) Received: from mx0.gentlemail.de (mx0.gentlemail.de [IPv6:2a00:e10:2800::a130]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0A78F7562F; Thu, 15 Jun 2017 13:24:49 +0000 (UTC) (envelope-from freebsd@omnilan.de) Received: from mh0.gentlemail.de (ezra.dcm1.omnilan.net [IPv6:2a00:e10:2800::a135]) by mx0.gentlemail.de (8.14.5/8.14.5) with ESMTP id v5FDOmt6082192; Thu, 15 Jun 2017 15:24:48 +0200 (CEST) (envelope-from freebsd@omnilan.de) Received: from titan.inop.mo1.omnilan.net (s1.omnilan.de [217.91.127.234]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mh0.gentlemail.de (Postfix) with ESMTPSA id 02FF4126; Thu, 15 Jun 2017 15:24:47 +0200 (CEST) Message-ID: <59428A93.4020200@omnilan.de> Date: Thu, 15 Jun 2017 15:24:35 +0200 From: Harry Schmalzbauer Organization: OmniLAN User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; de-DE; rv:1.9.2.8) Gecko/20100906 Lightning/1.0b2 Thunderbird/3.1.2 MIME-Version: 1.0 To: Luiz Otavio O Souza CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r319881 - head/sys/dev/netmap References: <201706122253.v5CMrJBB038568@repo.freebsd.org> <59428851.8040900@omnilan.de> In-Reply-To: <59428851.8040900@omnilan.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (mx0.gentlemail.de [IPv6:2a00:e10:2800::a130]); Thu, 15 Jun 2017 15:24:48 +0200 (CEST) X-Milter: Spamilter (Reciever: mx0.gentlemail.de; Sender-ip: ; Sender-helo: mh0.gentlemail.de; ) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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, 15 Jun 2017 13:24:50 -0000 Bezüglich Harry Schmalzbauer's Nachricht vom 15.06.2017 15:14 (localtime): > Bezüglich Luiz Otavio O Souza's Nachricht vom 13.06.2017 00:53 > (localtime): >> Author: loos >> Date: Mon Jun 12 22:53:18 2017 >> New Revision: 319881 >> URL: https://svnweb.freebsd.org/changeset/base/319881 >> >> Log: >> Update the current version of netmap to bring it in sync with the github >> version. >> >> This commit contains mostly refactoring, a few fixes and minor added >> functionality. >> >> Submitted by: Vincenzo Maffione >> Requested by: many >> Sponsored by: Rubicon Communications, LLC (Netgate) >> >> Modified: >> head/sys/dev/netmap/if_ixl_netmap.h >> head/sys/dev/netmap/netmap.c >> head/sys/dev/netmap/netmap_freebsd.c > Here's a interfering change which > reverts r313982 for sys/dev/netmap/netmap_freebsd.c: > > @@ -2143,7 +2146,7 @@ > if (ptnmd->ptn_dev) { > nm_os_pt_memdev_iounmap(ptnmd->ptn_dev); > } > - ptnmd->nm_addr = NULL; > + ptnmd->nm_addr = 0; > ptnmd->nm_paddr = 0; > } > } > > … >> head/sys/dev/netmap/netmap_mem2.c > Also in sys/dev/netmap/netmap_mem2.c > r313982 was reverted: > > @@ -648,7 +671,7 @@ > &rid, 0, ~0, *mem_size, RF_ACTIVE); > if (ptn_dev->pci_mem == NULL) { > *nm_paddr = 0; > - *nm_addr = NULL; > + *nm_addr = 0; > return ENOMEM; > } > Urghs, pasted the hunks wrong! The latter is in sys/dev/netmap/netmap_freebsd.c and the former belongs to sys/dev/netmap/netmap_mem2.c. Sorry for the consfusion! -harry