Date: Mon, 18 Nov 2013 14:44:50 +0000 (UTC) From: Max Khon <fjoe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334200 - head/net/aoe/files Message-ID: <201311181444.rAIEio8c034700@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311181444.rAIEio8c034700>