From owner-svn-ports-all@FreeBSD.ORG  Thu Jun  5 10:21:04 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4494159D;
 Thu,  5 Jun 2014 10:21:04 +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 32A6D2880;
 Thu,  5 Jun 2014 10:21:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55AL4dG078791;
 Thu, 5 Jun 2014 10:21:04 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55AL4cf078790;
 Thu, 5 Jun 2014 10:21:04 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <201406051021.s55AL4cf078790@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Thu, 5 Jun 2014 10:21:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356624 - 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
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jun 2014 10:21:04 -0000

Author: fjoe
Date: Thu Jun  5 10:21:03 2014
New Revision: 356624
URL: http://svnweb.freebsd.org/changeset/ports/356624
QAT: https://qat.redports.org/buildarchive/r356624/

Log:
  Unbreak on FreeBSD 11 (32-bit ifi_mtu).

Modified:
  head/net/aoe/files/patch-aoenet.c

Modified: head/net/aoe/files/patch-aoenet.c
==============================================================================
--- head/net/aoe/files/patch-aoenet.c	Thu Jun  5 09:41:33 2014	(r356623)
+++ head/net/aoe/files/patch-aoenet.c	Thu Jun  5 10:21:03 2014	(r356624)
@@ -1,5 +1,5 @@
 --- aoenet.c.orig	2006-05-25 23:10:11.000000000 +0700
-+++ aoenet.c	2014-02-09 12:48:36.000000000 +0700
++++ aoenet.c	2014-06-05 17:19:44.000000000 +0700
 @@ -77,8 +77,11 @@
  #define NECODES (sizeof(aoe_errlist) /  sizeof(char *) - 1)
  #if (__FreeBSD_version < 600000)
@@ -69,3 +69,15 @@
  		if (m == NULL) {
  			IPRINTK("m_copypacket failure\n");
  			continue;
+@@ -384,9 +398,9 @@
+         if (m->m_pkthdr.len >
+             ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS)) {
+                 if_printf(ifp, "discard oversize frame "
+-                                "(ether type %x flags %x len %u > max %lu)\n",
++                                "(ether type %x flags %x len %u > max %u)\n",
+                                 etype, m->m_flags, m->m_pkthdr.len,
+-                                ETHER_MAX_FRAME(ifp, etype,
++                                (int) ETHER_MAX_FRAME(ifp, etype,
+                                                 m->m_flags & M_HASFCS));
+                 ifp->if_ierrors++;
+                 m_freem(m);