From owner-svn-ports-head@FreeBSD.ORG  Mon Nov 18 14:44:50 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 8E7B5CCC;
 Mon, 18 Nov 2013 14:44:50 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7E49F2F4B;
 Mon, 18 Nov 2013 14:44:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIEiowp034701;
 Mon, 18 Nov 2013 14:44:50 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIEio8c034700;
 Mon, 18 Nov 2013 14:44:50 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <201311181444.rAIEio8c034700@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Mon, 18 Nov 2013 14:44:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334200 - 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-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Nov 2013 14:44:50 -0000

Author: fjoe
Date: Mon Nov 18 14:44:49 2013
New Revision: 334200
URL: http://svnweb.freebsd.org/changeset/ports/334200

Log:
  Unbreak build on FreeBSD 10 (new mbuf API).

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

Modified: head/net/aoe/files/patch-aoenet.c
==============================================================================
--- head/net/aoe/files/patch-aoenet.c	Mon Nov 18 14:17:16 2013	(r334199)
+++ head/net/aoe/files/patch-aoenet.c	Mon Nov 18 14:44:49 2013	(r334200)
@@ -1,5 +1,5 @@
---- aoenet.c.orig	2010-09-13 12:24:34.000000000 +0700
-+++ aoenet.c	2010-09-13 12:26:12.000000000 +0700
+--- aoenet.c.orig	2013-11-18 21:43:13.000000000 +0700
++++ aoenet.c	2013-11-18 21:43:21.000000000 +0700
 @@ -77,8 +77,11 @@
  #define NECODES (sizeof(aoe_errlist) /  sizeof(char *) - 1)
  #if (__FreeBSD_version < 600000)
@@ -13,7 +13,26 @@
  #endif
  #define IFLISTSZ 1024
  
-@@ -223,6 +226,9 @@
+@@ -190,10 +193,18 @@
+ /* 
+  * a dummy "free" function for mbuf ext buffer 
+  */
++#if __FreeBSD_version >= 1000050
++static int
++nilfn(struct mbuf *m, void *a, void *b)
++{
++	return EXT_FREE_OK;
++}
++#else
+ static void
+ nilfn(void *a, void *b)
+ {
+ }
++#endif
+ 
+ /* Create a mbuf chain and point to our data section(s). */
+ static struct mbuf *
+@@ -223,6 +234,9 @@
  
  		m1->m_ext.ref_cnt = NULL;
  		MEXTADD(m1, f->f_data, len, nilfn,