From owner-svn-ports-all@FreeBSD.ORG Thu Oct 2 18:23:44 2014 Return-Path: Delivered-To: svn-ports-all@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 03EDCAA8; Thu, 2 Oct 2014 18:23:44 +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 C9E12C74; Thu, 2 Oct 2014 18:23:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s92INhpo026606; Thu, 2 Oct 2014 18:23:43 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s92INg6h026604; Thu, 2 Oct 2014 18:23:42 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201410021823.s92INg6h026604@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Thu, 2 Oct 2014 18:23:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369843 - in head/emulators/parallels-tools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Oct 2014 18:23:44 -0000 Author: glebius (src committer) Date: Thu Oct 2 18:23:42 2014 New Revision: 369843 URL: https://svnweb.freebsd.org/changeset/ports/369843 QAT: https://qat.redports.org/buildarchive/r369843/ Log: Update for ifnet(9) changes in head. Approved by: bapt (blanket) Added: head/emulators/parallels-tools/files/ head/emulators/parallels-tools/files/patch-pvmnet-if_pvmnet.c (contents, props changed) Modified: head/emulators/parallels-tools/Makefile Modified: head/emulators/parallels-tools/Makefile ============================================================================== --- head/emulators/parallels-tools/Makefile Thu Oct 2 18:17:48 2014 (r369842) +++ head/emulators/parallels-tools/Makefile Thu Oct 2 18:23:42 2014 (r369843) @@ -3,6 +3,7 @@ PORTNAME= parallels-tools PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/bland Added: head/emulators/parallels-tools/files/patch-pvmnet-if_pvmnet.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/parallels-tools/files/patch-pvmnet-if_pvmnet.c Thu Oct 2 18:23:42 2014 (r369843) @@ -0,0 +1,47 @@ +--- pvmnet/if_pvmnet.c.orig 2014-10-02 22:19:21.000000000 +0400 ++++ pvmnet/if_pvmnet.c 2014-10-02 22:21:10.000000000 +0400 +@@ -364,12 +364,20 @@ + for (offset = io_get_rcv_offset(sc); + (size = io_get_packet_size(sc, offset)); offset += FULL_PACKET_SIZE(size)) { + if (size > ETHER_MAX_LEN) { ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); ++#else + ifp->if_ierrors++; ++#endif + continue; + } + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); + if (m == NULL) { ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); ++#else + ifp->if_ierrors++; ++#endif + continue; + } + m->m_pkthdr.rcvif = ifp; +@@ -379,7 +387,11 @@ + m->m_pkthdr.len = m->m_len = size; + io_read_data(sc, offset, m); + ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); ++#else + ifp->if_ipackets++; ++#endif + + PVMNET_UNLOCK(sc); + (*ifp->if_input)(ifp, m); +@@ -538,7 +550,11 @@ + io_notify_sndbuf_full(sc); + break; + } ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); ++#else + ifp->if_opackets++; ++#endif + BPF_MTAP(ifp, m); + m_freem(m); + }