1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
--- aoenet.c.orig 2006-05-25 23:10:11.000000000 +0700
+++ aoenet.c 2014-02-09 12:48:36.000000000 +0700
@@ -77,8 +77,11 @@
#define NECODES (sizeof(aoe_errlist) / sizeof(char *) - 1)
#if (__FreeBSD_version < 600000)
#define IFPADDR(ifp) (((struct arpcom *) (ifp))->ac_enaddr)
-#else
+#elif (__FreeBSD_version < 700000)
#define IFPADDR(ifp) IFP2ENADDR(ifp)
+#else
+#include <net/if_dl.h>
+#define IFPADDR(ifp) IF_LLADDR(ifp)
#endif
#define IFLISTSZ 1024
@@ -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 *
@@ -201,7 +212,7 @@
{
struct mbuf *m;
- if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL)
+ if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
return (NULL);
m->m_len = AOEHDRSZ;
m->m_pkthdr.len = f->f_mlen;
@@ -215,7 +226,7 @@
u_int len;
len = f->f_mlen - AOEHDRSZ;
- if ((m1 = m_get(M_DONTWAIT, MT_DATA)) == NULL) {
+ if ((m1 = m_get(M_NOWAIT, MT_DATA)) == NULL) {
m_freem(m);
return (NULL);
}
@@ -223,6 +234,9 @@
m1->m_ext.ref_cnt = NULL;
MEXTADD(m1, f->f_data, len, nilfn,
+#if (__FreeBSD_version >= 800000)
+ f->f_data,
+#endif
NULL, 0, EXT_NET_DRV);
m1->m_len = len;
m1->m_next = NULL;
@@ -276,7 +290,7 @@
if (!is_aoe_netif(ifp))
continue;
memcpy(h->ah_src, IFPADDR(ifp), sizeof(h->ah_src));
- m = m_copypacket(m0, M_DONTWAIT);
+ m = m_copypacket(m0, M_NOWAIT);
if (m == NULL) {
IPRINTK("m_copypacket failure\n");
continue;
|
