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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
|
--- 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)
#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
@@ -160,7 +163,11 @@
register char *p, *q;
register int len;
+#if __FreeBSD_version >= 1100030
+ switch (ifp->if_type) {
+#else
switch (ifp->if_data.ifi_type) {
+#endif
default:
return (FALSE);
case IFT_ETHER:
@@ -190,10 +197,28 @@
/*
* a dummy "free" function for mbuf ext buffer
*/
+#if __FreeBSD_version >= 1200051
+static void
+nilfn(struct mbuf *m)
+{
+}
+#elif __FreeBSD_version >= 1100028
+static void
+nilfn(struct mbuf *m, void *a, void *b)
+{
+}
+#elif __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 +226,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,14 +240,21 @@
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);
}
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,
+#endif
NULL, 0, EXT_NET_DRV);
m1->m_len = len;
m1->m_next = NULL;
@@ -276,7 +308,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;
@@ -298,7 +330,11 @@
aoenet_maxsize(struct ifnet *ifp)
{
/* max payload size of packet based on interface mtu setting */
+#if __FreeBSD_version >= 1100030
+ return ((ifp->if_mtu - AOEHDRSZ) & ~(DEV_BSIZE - 1));
+#else
return ((ifp->if_data.ifi_mtu - AOEHDRSZ) & ~(DEV_BSIZE - 1));
+#endif
}
@@ -362,7 +398,11 @@
*/
if ((m->m_flags & M_PKTHDR) == 0) {
if_printf(ifp, "discard frame w/o packet header\n");
+#if __FreeBSD_version >= 1100036
+ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+#else
ifp->if_ierrors++;
+#endif
m_freem(m);
return;
}
@@ -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);
+#if __FreeBSD_version >= 1100036
+ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+#else
ifp->if_ierrors++;
+#endif
m_freem(m);
return;
}
@@ -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 "
- "(ether type %x flags %x len %u > max %lu)\n",
+ "(ether type %x flags %x len %u > max %u)\n",
etype, m->m_flags, m->m_pkthdr.len,
- ETHER_MAX_FRAME(ifp, etype,
+ (int) ETHER_MAX_FRAME(ifp, etype,
m->m_flags & M_HASFCS));
+#if __FreeBSD_version >= 1100036
+ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+#else
ifp->if_ierrors++;
+#endif
m_freem(m);
return;
}
if (m->m_pkthdr.rcvif == NULL) {
if_printf(ifp, "discard frame w/o interface pointer\n");
+#if __FreeBSD_version >= 1100036
+ if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
+#else
ifp->if_ierrors++;
+#endif
m_freem(m);
return;
}
@@ -417,7 +469,11 @@
m->m_flags &= ~M_HASFCS;
}
+#if __FreeBSD_version >= 1100036
+ if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len);
+#else
ifp->if_ibytes += m->m_pkthdr.len;
+#endif
if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
if (bcmp(etherbroadcastaddr, eh->ether_dhost,
@@ -427,7 +483,11 @@
m->m_flags |= M_MCAST;
}
if (m->m_flags & (M_BCAST|M_MCAST))
+#if __FreeBSD_version >= 1100036
+ if_inc_counter(ifp, IFCOUNTER_IMCASTS, 1);
+#else
ifp->if_imcasts++;
+#endif
aoeintr(m);
/* netisr_dispatch(NETISR_AOE, m); */
@@ -472,7 +532,11 @@
IFNET_RLOCK();
TAILQ_FOREACH(ifp, &ifnet, if_link) {
+#if __FreeBSD_version >= 1100030
+ switch (ifp->if_type) {
+#else
switch (ifp->if_data.ifi_type) {
+#endif
case IFT_ETHER:
case IFT_FASTETHER:
case IFT_GIGABITETHERNET:
@@ -501,7 +565,11 @@
IFNET_RLOCK();
TAILQ_FOREACH(ifp, &ifnet, if_link) {
+#if __FreeBSD_version >= 1100030
+ switch (ifp->if_type) {
+#else
switch (ifp->if_data.ifi_type) {
+#endif
case IFT_ETHER:
case IFT_FASTETHER:
case IFT_GIGABITETHERNET:
--- aoenet.c.orig 2019-08-14 20:53:51.415030000 -0700
+++ aoenet.c 2019-08-14 20:58:53.326160000 -0700
@@ -85,6 +85,12 @@
#endif
#define IFLISTSZ 1024
+#if __FreeBSD_version >= 1200000
+#define IFNET_FOREACH(v, h, e) CK_STAILQ_FOREACH(v, h, e)
+#else
+#define IFNET_FOREACH(v, h, e) TAILQ_FOREACH(v, h, e)
+#endif
+
static char aoe_iflist[IFLISTSZ];
static int sysctl_aoe_iflist(SYSCTL_HANDLER_ARGS);
@@ -304,7 +310,7 @@
h->ah_cmd = AOECMD_CFG;
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ IFNET_FOREACH(ifp, &ifnet, if_link) {
if (!is_aoe_netif(ifp))
continue;
memcpy(h->ah_src, IFPADDR(ifp), sizeof(h->ah_src));
@@ -506,7 +512,7 @@
#ifdef FORCE_NETWORK_HOOK
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ IFNET_FOREACH(ifp, &ifnet, if_link) {
if (!is_aoe_netif(ifp)) {
if (ifp->if_input == aoe_ether_input)
ifp->if_input = old_ether_input;
@@ -531,7 +537,7 @@
struct ifnet *ifp;
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ IFNET_FOREACH(ifp, &ifnet, if_link) {
#if __FreeBSD_version >= 1100030
switch (ifp->if_type) {
#else
@@ -564,7 +570,7 @@
struct ifnet *ifp;
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ IFNET_FOREACH(ifp, &ifnet, if_link) {
#if __FreeBSD_version >= 1100030
switch (ifp->if_type) {
#else
|
