svn commit: r301528 - in head/emulators/virtualbox-ose-kmod: . files
Bernhard Froehlich
decke at FreeBSD.org
Wed Jul 25 19:15:15 UTC 2012
Author: decke
Date: Wed Jul 25 19:15:14 2012
New Revision: 301528
URL: http://svn.freebsd.org/changeset/ports/301528
Log:
- Fix panic at unload of vboxnetadp
- Bump PORTREVISION
PR: ports/169565
Submitted by: Thomas Eberhardt <sneakywumpus at googlemail.com>
Obtained from: virtualbox r41199
Modified:
head/emulators/virtualbox-ose-kmod/Makefile (contents, props changed)
head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c (contents, props changed)
Modified: head/emulators/virtualbox-ose-kmod/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-kmod/Makefile Wed Jul 25 19:12:39 2012 (r301527)
+++ head/emulators/virtualbox-ose-kmod/Makefile Wed Jul 25 19:15:14 2012 (r301528)
@@ -7,6 +7,7 @@
PORTNAME= virtualbox-ose
DISTVERSION= 4.1.18
+PORTREVISION= 1
CATEGORIES= emulators kld
MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \
Modified: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c
==============================================================================
--- head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c Wed Jul 25 19:12:39 2012 (r301527)
+++ head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c Wed Jul 25 19:15:14 2012 (r301528)
@@ -2,8 +2,8 @@ This patch adds support for VIMAGE to VB
also fixes that panic.
Submitted by: Mikolaj Golub <trociny at freebsd.org>
---- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2012-03-13 15:15:44.000000000 +0200
-+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2012-04-01 13:23:58.000000000 +0300
+--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig 2012-06-20 15:17:03.000000000 +0200
++++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c 2012-07-25 18:30:13.695891353 +0200
@@ -68,6 +68,22 @@
#define VBOXNETADP_OS_SPECFIC 1
#include "../VBoxNetAdpInternal.h"
@@ -27,7 +27,7 @@ Submitted by: Mikolaj Golub <trociny at
static int VBoxNetAdpFreeBSDCtrlioctl(struct cdev *, u_long, caddr_t, int flags,
struct thread *);
static struct cdevsw vboxnetadp_cdevsw =
-@@ -260,6 +276,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
+@@ -260,6 +276,7 @@
{
struct ifnet *ifp;
@@ -35,7 +35,7 @@ Submitted by: Mikolaj Golub <trociny at
ifp = if_alloc(IFT_ETHER);
if (ifp == NULL)
return VERR_NO_MEMORY;
-@@ -279,6 +296,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
+@@ -279,6 +296,7 @@
strncpy(pThis->szName, ifp->if_xname, VBOXNETADP_MAX_NAME_LEN);
pThis->u.s.ifp = ifp;
@@ -43,12 +43,11 @@ Submitted by: Mikolaj Golub <trociny at
return 0;
}
-@@ -286,7 +304,9 @@ void vboxNetAdpOsDestroy(PVBOXNETADP pTh
- {
+@@ -287,6 +305,8 @@
struct ifnet *ifp;
-+ VBOXCURVNET_SET(ifp->if_vnet);
ifp = pThis->u.s.ifp;
++ VBOXCURVNET_SET(ifp->if_vnet);
ether_ifdetach(ifp);
if_free(ifp);
+ VBOXCURVNET_RESTORE();
More information about the svn-ports-head
mailing list