mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

- Fix panic at unload of vboxnetadp

Browse Source 
- Bump PORTREVISION

PR:		ports/169565
Submitted by:	Thomas Eberhardt <sneakywumpus@googlemail.com>
Obtained from:	virtualbox r41199
This commit is contained in:
Bernhard Froehlich 2012-07-25 19:15:14 +00:00
parent 4136328e14
commit 0584205d76
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=301528
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emulators/virtualbox-ose-kmod/Makefile
View File

@ -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/ \

13
emulators/virtualbox-ose-kmod/files/patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c
View File

@ -2,8 +2,8 @@ This patch adds support for VIMAGE to VBoxNetAdp and thus
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 freebsd.org>
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 freebsd.org>
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 freebsd.org>
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();