svn commit: r206461 - head/sys/netinet/ipfw

Bjoern A. Zeeb bz at FreeBSD.org
Sat Apr 10 22:11:02 UTC 2010


Author: bz
Date: Sat Apr 10 22:11:01 2010
New Revision: 206461
URL: http://svn.freebsd.org/changeset/base/206461

Log:
  Try to help with a virtualized dummynet after r206428.
  
  This adds the explicit include (so far probably included through one of the
  few "hidden" includes in other header files) for vnet.h and adds a cast
  to unbreak LINT-VIMAGE.

Modified:
  head/sys/netinet/ipfw/ip_dn_io.c

Modified: head/sys/netinet/ipfw/ip_dn_io.c
==============================================================================
--- head/sys/netinet/ipfw/ip_dn_io.c	Sat Apr 10 19:25:55 2010	(r206460)
+++ head/sys/netinet/ipfw/ip_dn_io.c	Sat Apr 10 22:11:01 2010	(r206461)
@@ -45,8 +45,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/sysctl.h>
+
 #include <net/if.h>	/* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */
 #include <net/netisr.h>
+#include <net/vnet.h>
+
 #include <netinet/in.h>
 #include <netinet/ip.h>		/* ip_len, ip_off */
 #include <netinet/ip_var.h>	/* ip_output(), IP_FORWARDING */
@@ -500,7 +503,7 @@ dummynet_task(void *context, int pending
 	struct timeval t;
 	struct mq q = { NULL, NULL }; /* queue to accumulate results */
 
-	CURVNET_SET(context);
+	CURVNET_SET((struct vnet *)context);
 
 	DN_BH_WLOCK();
 


More information about the svn-src-head mailing list