Date: Sun, 31 Aug 2014 18:35:40 +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: r366808 - head/net/aoe/files Message-ID: <201408311835.s7VIZeC0094614@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fjoe Date: Sun Aug 31 18:35:40 2014 New Revision: 366808 URL: http://svnweb.freebsd.org/changeset/ports/366808 QAT: https://qat.redports.org/buildarchive/r366808/ Log: Unbreak on -CURRENT. Modified: head/net/aoe/files/patch-aoenet.c Modified: head/net/aoe/files/patch-aoenet.c ============================================================================== --- head/net/aoe/files/patch-aoenet.c Sun Aug 31 18:30:43 2014 (r366807) +++ head/net/aoe/files/patch-aoenet.c Sun Aug 31 18:35:40 2014 (r366808) @@ -1,5 +1,5 @@ --- aoenet.c.orig 2006-05-25 23:10:11.000000000 +0700 -+++ aoenet.c 2014-09-01 01:49:14.000000000 +0700 ++++ aoenet.c 2014-09-01 01:54:47.000000000 +0700 @@ -77,8 +77,11 @@ #define NECODES (sizeof(aoe_errlist) / sizeof(char *) - 1) #if (__FreeBSD_version < 600000) @@ -47,7 +47,7 @@ return (NULL); m->m_len = AOEHDRSZ; m->m_pkthdr.len = f->f_mlen; -@@ -215,7 +232,7 @@ +@@ -215,14 +232,21 @@ u_int len; len = f->f_mlen - AOEHDRSZ; @@ -56,9 +56,13 @@ m_freem(m); return (NULL); } -@@ -223,6 +240,9 @@ + m->m_next = m1; ++#if __FreeBSD_version >= 1100028 ++ m1->m_ext.ext_cnt = NULL; ++#else m1->m_ext.ref_cnt = NULL; ++#endif MEXTADD(m1, f->f_data, len, nilfn, +#if (__FreeBSD_version >= 800000) + f->f_data, @@ -66,7 +70,7 @@ NULL, 0, EXT_NET_DRV); m1->m_len = len; m1->m_next = NULL; -@@ -276,7 +296,7 @@ +@@ -276,7 +300,7 @@ if (!is_aoe_netif(ifp)) continue; memcpy(h->ah_src, IFPADDR(ifp), sizeof(h->ah_src)); @@ -75,7 +79,7 @@ if (m == NULL) { IPRINTK("m_copypacket failure\n"); continue; -@@ -384,9 +404,9 @@ +@@ -384,9 +408,9 @@ if (m->m_pkthdr.len > ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS)) { if_printf(ifp, "discard oversize frame "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408311835.s7VIZeC0094614>