sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unbreak on CURRENT

Browse source
This commit is contained in:
Max Khon 2017-10-18 06:26:08 +00:00
parent 59170624d3
commit 072d56f36f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=452313
1 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
net/aoe/files/patch-aoenet.c
View file

@ -1,5 +1,5 @@
--- aoenet.c.orig 2006-05-25 20:10:11.000000000 +0400
+++ aoenet.c 2014-10-02 20:18:23.000000000 +0400
--- aoenet.c.orig 2006-05-25 16:10:11.000000000 +0000
+++ aoenet.c 2017-10-17 20:01:42.698938000 +0000
@@ -77,8 +77,11 @@
#define NECODES (sizeof(aoe_errlist) / sizeof(char *) - 1)
#if (__FreeBSD_version < 600000)
@ -25,21 +25,25 @@
default:
return (FALSE);
case IFT_ETHER:
@@ -190,10 +197,24 @@
@@ -190,10 +197,28 @@
/*
* a dummy "free" function for mbuf ext buffer
*/
+#if __FreeBSD_version >= 1000050
+#if __FreeBSD_version >= 1100028
+#if __FreeBSD_version >= 1200051
+static void
+nilfn(struct mbuf *m)
+{
+}
+#elif __FreeBSD_version >= 1100028
+static void
+#else
+static int
+#endif
+nilfn(struct mbuf *m, void *a, void *b)
+{
+#if __FreeBSD_version < 1100028
+}
+#elif __FreeBSD_version >= 1000050
+static int
+nilfn(struct mbuf *m, void *a, void *b)
+{
+ return EXT_FREE_OK;
+#endif
+}
+#else
static void
@ -50,7 +54,7 @@
/* Create a mbuf chain and point to our data section(s). */
static struct mbuf *
@@ -201,7 +222,7 @@
@@ -201,7 +226,7 @@
{
struct mbuf *m;
@ -59,7 +63,7 @@
return (NULL);
m->m_len = AOEHDRSZ;
m->m_pkthdr.len = f->f_mlen;
@@ -215,14 +236,21 @@
@@ -215,14 +240,21 @@
u_int len;
len = f->f_mlen - AOEHDRSZ;
@ -82,7 +86,7 @@
NULL, 0, EXT_NET_DRV);
m1->m_len = len;
m1->m_next = NULL;
@@ -276,7 +304,7 @@
@@ -276,7 +308,7 @@
if (!is_aoe_netif(ifp))
continue;
memcpy(h->ah_src, IFPADDR(ifp), sizeof(h->ah_src));
@ -91,7 +95,7 @@
if (m == NULL) {
IPRINTK("m_copypacket failure\n");
continue;
@@ -298,7 +326,11 @@
@@ -298,7 +330,11 @@
aoenet_maxsize(struct ifnet *ifp)
{
/* max payload size of packet based on interface mtu setting */
@ -103,7 +107,7 @@
}
@@ -362,7 +394,11 @@
@@ -362,7 +398,11 @@
*/
if ((m->m_flags & M_PKTHDR) == 0) {
if_printf(ifp, "discard frame w/o packet header\n");
@ -115,7 +119,7 @@
m_freem(m);
return;
}
@@ -371,7 +407,11 @@
@@ -371,7 +411,11 @@
if_printf(ifp, "discard frame w/o leading ethernet "
"header (len %u pkt len %u)\n",
m->m_len, m->m_pkthdr.len);
@ -127,7 +131,7 @@
m_freem(m);
return;
}
@@ -384,17 +424,25 @@
@@ -384,17 +428,25 @@
if (m->m_pkthdr.len >
ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS)) {
if_printf(ifp, "discard oversize frame "
@ -155,7 +159,7 @@
m_freem(m);
return;
}
@@ -417,7 +465,11 @@
@@ -417,7 +469,11 @@
m->m_flags &= ~M_HASFCS;
}
@ -167,7 +171,7 @@
if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
if (bcmp(etherbroadcastaddr, eh->ether_dhost,
@@ -427,7 +479,11 @@
@@ -427,7 +483,11 @@
m->m_flags |= M_MCAST;
}
if (m->m_flags & (M_BCAST|M_MCAST))
@ -179,7 +183,7 @@
aoeintr(m);
/* netisr_dispatch(NETISR_AOE, m); */
@@ -472,7 +528,11 @@
@@ -472,7 +532,11 @@
IFNET_RLOCK();
TAILQ_FOREACH(ifp, &ifnet, if_link) {
@ -191,7 +195,7 @@
case IFT_ETHER:
case IFT_FASTETHER:
case IFT_GIGABITETHERNET:
@@ -501,7 +561,11 @@
@@ -501,7 +565,11 @@
IFNET_RLOCK();
TAILQ_FOREACH(ifp, &ifnet, if_link) {