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
|
$NetBSD: patch-ad,v 1.3 2002/10/02 05:28:36 uebayasi Exp $
--- source/vmnet/if_hubvar.h Tue Apr 3 00:57:57 2001
+++ source/vmnet/if_hubvar.h Sun Jun 10 11:35:34 2001
@@ -76,4 +76,8 @@
#define MAKEHUBDEV(d,u) MAKEPORTDEV(d,0,-1)
#define HUBMINPKT ETHER_HDR_LEN
-#define HUBMAXPKT (ETHER_MAX_FRAME(ETHERTYPE_VLAN, 1))
+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000)
+# define HUBMAXPKT(ifp) (ETHER_MAX_FRAME(ifp, ETHERTYPE_VLAN, 1))
+#else
+# define HUBMAXPKT (ETHER_MAX_FRAME(ETHERTYPE_VLAN, 1))
+#endif
--- source/vmnet/if_hubmod.c Tue Apr 3 22:51:19 2001
+++ source/vmnet/if_hubmod.c Sat Jun 23 23:56:58 2001
@@ -128,7 +128,11 @@
static struct hubdev_softc *hub_scs[MAXHUBDEVS];
+#if __NetBSD_Version__ >= 106080000
+MOD_DEV("vmnet", "vmnet", NULL, -1, &hub_dev, -1)
+#else
MOD_DEV("vmnet", LM_DT_CHAR, -1, &hub_dev)
+#endif
int
if_hub_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
@@ -141,10 +145,19 @@
{
int error = 0, i, j;
struct hubdev_softc *sc;
+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000)
+ struct ifnet *ifp;
+#endif
switch (cmd) {
case LKM_E_LOAD:
+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000)
+ ifp = (struct ifnet *)malloc(sizeof(*ifp), M_MRTABLE, M_WAITOK);
+ ifp->if_mtu = ETHERMTU;
+ if (HUBMAXPKT(ifp) > MCLBYTES) {
+#else
if (HUBMAXPKT > MCLBYTES) {
+#endif
printf("if_hub: HUBMAXPKT > MCLBYTES\n");
return EIO;
}
@@ -496,6 +509,11 @@
fp->f_type = DTYPE_VNODE;
fp->f_ops = &vnops;
fp->f_data = (caddr_t)vp;
+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000)
+#ifdef FILE_SET_MATURE
+ FILE_SET_MATURE(fp);
+#endif
+#endif
FILE_UNUSE(fp, p);
p->p_dupfd = fd;
@@ -903,6 +921,9 @@
struct hubport_softc *portsc;
struct mbuf *m;
int error;
+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000)
+ struct ifnet *ifp;
+#endif
hubsc = hub_scs[HUBUNIT(dev)];
if (hubsc == NULL)
@@ -917,7 +938,12 @@
if (uio->uio_resid == 0)
return (0);
+#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000)
+ ifp = &portsc->port_if;
+ if ((uio->uio_resid < HUBMINPKT) || (uio->uio_resid > HUBMAXPKT(ifp))) {
+#else
if ((uio->uio_resid < HUBMINPKT) || (uio->uio_resid > HUBMAXPKT)) {
+#endif
HUBDEBUG("if_hub: write: illegal length %d\n", uio->uio_resid);
return EIO;
}
|
