diff options
| author | kristerw <kristerw> | 2001-08-10 23:17:22 +0000 |
|---|---|---|
| committer | kristerw <kristerw> | 2001-08-10 23:17:22 +0000 |
| commit | eb743e04791de37a35f27c04214531a77d401044 (patch) | |
| tree | ddac8a5cdfb668e32bb91c27a804defcecb77fb0 /emulators/vmware-module | |
| parent | dd291f5dc4f770e0fbb76dbe70d666e59395e777 (diff) | |
| download | pkgsrc-eb743e04791de37a35f27c04214531a77d401044.tar.gz | |
Made it compile for NetBSD-1.5.1
Diffstat (limited to 'emulators/vmware-module')
| -rw-r--r-- | emulators/vmware-module/distinfo | 4 | ||||
| -rw-r--r-- | emulators/vmware-module/patches/patch-ad | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/emulators/vmware-module/distinfo b/emulators/vmware-module/distinfo index 92059a49adf..47a3a78c329 100644 --- a/emulators/vmware-module/distinfo +++ b/emulators/vmware-module/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ +$NetBSD: distinfo,v 1.2 2001/08/10 23:17:22 kristerw Exp $ SHA1 (vmware-netbsd-1.0.tgz) = ea3ec59de0bab2ecd57aedbff0ade54f88f84ae2 Size (vmware-netbsd-1.0.tgz) = 93286 bytes SHA1 (patch-aa) = dc008ea571bb2fd15be77a3bd39bfdecf9f1f243 SHA1 (patch-ab) = 2ff6e47f7e57c56ac026749e579bf4ebe0d8ac6f SHA1 (patch-ac) = 528dab24b0daebb97fcfd911d9abe0c60804351a -SHA1 (patch-ad) = fa3a8aef090c0cb9ef54bf423a6a9c78bfbb1a49 +SHA1 (patch-ad) = b04cb3a5422fbe5f97c9f5998272b9c7e2c64e47 SHA1 (patch-ae) = 9f4025f006228505d14d241e2a89be291105e7f4 diff --git a/emulators/vmware-module/patches/patch-ad b/emulators/vmware-module/patches/patch-ad index 22b3d26faec..4b140e21d93 100644 --- a/emulators/vmware-module/patches/patch-ad +++ b/emulators/vmware-module/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ +$NetBSD: patch-ad,v 1.2 2001/08/10 23:17:23 kristerw 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 @@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ #define HUBMINPKT ETHER_HDR_LEN -#define HUBMAXPKT (ETHER_MAX_FRAME(ETHERTYPE_VLAN, 1)) -+#if __NetBSD_Version__ >= 105230000 ++#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)) @@ -18,13 +18,13 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ { int error = 0, i, j; struct hubdev_softc *sc; -+#if __NetBSD_Version__ >= 105230000 ++#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) + struct ifnet *ifp; +#endif switch (cmd) { case LKM_E_LOAD: -+#if __NetBSD_Version__ >= 105230000 ++#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) { @@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ fp->f_type = DTYPE_VNODE; fp->f_ops = &vnops; fp->f_data = (caddr_t)vp; -+#if __NetBSD_Version__ >= 105230000 ++#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) +#ifdef FILE_SET_MATURE + FILE_SET_MATURE(fp); +#endif @@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ struct hubport_softc *portsc; struct mbuf *m; int error; -+#if __NetBSD_Version__ >= 105230000 ++#if __NetBSD_Version__ >= 105230000 || (__NetBSD_Version__ >= 105000100 && __NetBSD_Version__ < 105010000) + struct ifnet *ifp; +#endif @@ -60,7 +60,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/07 14:40:07 veego Exp $ if (uio->uio_resid == 0) return (0); -+#if __NetBSD_Version__ >= 105230000 ++#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 |