From owner-svn-ports-all@FreeBSD.ORG Thu Oct 2 16:23:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A65F46A2; Thu, 2 Oct 2014 16:23:32 +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 9249EB90; Thu, 2 Oct 2014 16:23:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s92GNW9e067186; Thu, 2 Oct 2014 16:23:32 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s92GNWQ3067184; Thu, 2 Oct 2014 16:23:32 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201410021623.s92GNWQ3067184@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 16:23:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369837 - in head/net/aoe: . 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 16:23:32 -0000 Author: glebius (src committer) Date: Thu Oct 2 16:23:31 2014 New Revision: 369837 URL: https://svnweb.freebsd.org/changeset/ports/369837 QAT: https://qat.redports.org/buildarchive/r369837/ Log: Fix build on head. Approved by: bapt Modified: head/net/aoe/Makefile head/net/aoe/files/patch-aoenet.c Modified: head/net/aoe/Makefile ============================================================================== --- head/net/aoe/Makefile Thu Oct 2 16:07:54 2014 (r369836) +++ head/net/aoe/Makefile Thu Oct 2 16:23:31 2014 (r369837) @@ -3,7 +3,7 @@ PORTNAME= aoe PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net kld MASTER_SITES= http://www.son.org/download/ DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION} Modified: head/net/aoe/files/patch-aoenet.c ============================================================================== --- head/net/aoe/files/patch-aoenet.c Thu Oct 2 16:07:54 2014 (r369836) +++ head/net/aoe/files/patch-aoenet.c Thu Oct 2 16:23:31 2014 (r369837) @@ -1,5 +1,5 @@ ---- aoenet.c.orig 2006-05-25 23:10:11.000000000 +0700 -+++ aoenet.c 2014-09-14 02:02:02.000000000 +0700 +--- aoenet.c.orig 2006-05-25 20:10:11.000000000 +0400 ++++ aoenet.c 2014-10-02 20:18:23.000000000 +0400 @@ -77,8 +77,11 @@ #define NECODES (sizeof(aoe_errlist) / sizeof(char *) - 1) #if (__FreeBSD_version < 600000) @@ -103,7 +103,31 @@ } -@@ -384,9 +416,9 @@ +@@ -362,7 +394,11 @@ + */ + if ((m->m_flags & M_PKTHDR) == 0) { + if_printf(ifp, "discard frame w/o packet header\n"); ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); ++#else + ifp->if_ierrors++; ++#endif + m_freem(m); + return; + } +@@ -371,7 +407,11 @@ + if_printf(ifp, "discard frame w/o leading ethernet " + "header (len %u pkt len %u)\n", + m->m_len, m->m_pkthdr.len); ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); ++#else + ifp->if_ierrors++; ++#endif + m_freem(m); + return; + } +@@ -384,17 +424,25 @@ if (m->m_pkthdr.len > ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS)) { if_printf(ifp, "discard oversize frame " @@ -113,9 +137,49 @@ - ETHER_MAX_FRAME(ifp, etype, + (int) ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS)); ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); ++#else ifp->if_ierrors++; ++#endif m_freem(m); -@@ -472,7 +504,11 @@ + return; + } + if (m->m_pkthdr.rcvif == NULL) { + if_printf(ifp, "discard frame w/o interface pointer\n"); ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); ++#else + ifp->if_ierrors++; ++#endif + m_freem(m); + return; + } +@@ -417,7 +465,11 @@ + m->m_flags &= ~M_HASFCS; + } + ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); ++#else + ifp->if_ibytes += m->m_pkthdr.len; ++#endif + + if (ETHER_IS_MULTICAST(eh->ether_dhost)) { + if (bcmp(etherbroadcastaddr, eh->ether_dhost, +@@ -427,7 +479,11 @@ + m->m_flags |= M_MCAST; + } + if (m->m_flags & (M_BCAST|M_MCAST)) ++#if __FreeBSD_version >= 1100036 ++ if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1); ++#else + ifp->if_imcasts++; ++#endif + + aoeintr(m); + /* netisr_dispatch(NETISR_AOE, m); */ +@@ -472,7 +528,11 @@ IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { @@ -127,7 +191,7 @@ case IFT_ETHER: case IFT_FASTETHER: case IFT_GIGABITETHERNET: -@@ -501,7 +537,11 @@ +@@ -501,7 +561,11 @@ IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) {