svn commit: r198103 - user/eri/pf45/head/sys/contrib/pf/net

[Ermal Luçi]

Author: eri
Date: Wed Oct 14 21:54:27 2009
New Revision: 198103
URL: http://svn.freebsd.org/changeset/base/198103

Log:
  Devirtualize even some event handlers.

Modified:
  user/eri/pf45/head/sys/contrib/pf/net/pf_if.c
  user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_if.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_if.c	Wed Oct 14 21:48:28 2009	(r198102)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_if.c	Wed Oct 14 21:54:27 2009	(r198103)
@@ -99,12 +99,12 @@ int			  pfi_buffer_cnt;
 int			  pfi_buffer_max;
 #endif
 #ifdef __FreeBSD__
-VNET_DEFINE(eventhandler_tag,	 pfi_attach_cookie);
-VNET_DEFINE(eventhandler_tag,	 pfi_detach_cookie);
-VNET_DEFINE(eventhandler_tag,	 pfi_attach_group_cookie);
-VNET_DEFINE(eventhandler_tag,	 pfi_change_group_cookie);
-VNET_DEFINE(eventhandler_tag,	 pfi_detach_group_cookie);
-VNET_DEFINE(eventhandler_tag,	 pfi_ifaddr_event_cookie);
+eventhandler_tag	 pfi_attach_cookie;
+eventhandler_tag	 pfi_detach_cookie;
+eventhandler_tag	 pfi_attach_group_cookie;
+eventhandler_tag	 pfi_change_group_cookie;
+eventhandler_tag	 pfi_detach_group_cookie;
+eventhandler_tag	 pfi_ifaddr_event_cookie;
 #endif
 
 void		 pfi_kif_update(struct pfi_kif *);

Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Wed Oct 14 21:48:28 2009	(r198102)
+++ user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c	Wed Oct 14 21:54:27 2009	(r198103)
@@ -269,18 +269,18 @@ VNET_DEFINE(int, pf_end_threads);
 struct mtx pf_task_mtx;
 
 /* pfsync */
-pfsync_state_import_t 		*pfsync_state_import_ptr;
-pfsync_insert_state_t		*pfsync_insert_state_ptr;
-pfsync_update_state_t		*pfsync_update_state_ptr;
-pfsync_delete_state_t		*pfsync_delete_state_ptr;
-pfsync_clear_states_t		*pfsync_clear_states_ptr;
-pfsync_state_in_use_t		*pfsync_state_in_use_ptr;
-pfsync_defer_t			*pfsync_defer_ptr;
-pfsync_up_t			*pfsync_up_ptr;
+pfsync_state_import_t 		*pfsync_state_import_ptr = NULL;
+pfsync_insert_state_t		*pfsync_insert_state_ptr = NULL;
+pfsync_update_state_t		*pfsync_update_state_ptr = NULL;
+pfsync_delete_state_t		*pfsync_delete_state_ptr = NULL;
+pfsync_clear_states_t		*pfsync_clear_states_ptr = NULL;
+pfsync_state_in_use_t		*pfsync_state_in_use_ptr = NULL;
+pfsync_defer_t			*pfsync_defer_ptr = NULL;
+pfsync_up_t			*pfsync_up_ptr = NULL;
 /* pflow */
-export_pflow_t			*export_pflow_ptr;
+export_pflow_t			*export_pflow_ptr = NULL;
 /* pflog */
-pflog_packet_t			*pflog_packet_ptr;
+pflog_packet_t			*pflog_packet_ptr = NULL;
 
 VNET_DEFINE(int, debug_pfugidhack);
 SYSCTL_VNET_INT(_debug, OID_AUTO, pfugidhack, CTLFLAG_RW,
@@ -3977,32 +3977,8 @@ vnet_pf_init(const void *unused) 
 	pf_pfil_hooked = 0;
 	pf_end_threads = 0;
 
-	/* pfsync */
-	pfsync_state_import_ptr = NULL;
-	pfsync_insert_state_ptr = NULL;
-	pfsync_update_state_ptr = NULL;
-	pfsync_delete_state_ptr = NULL;
-	pfsync_clear_states_ptr = NULL;
-	pfsync_state_in_use_ptr = NULL;
-	pfsync_defer_ptr = NULL;
-	pfsync_up_ptr = NULL;
-	/* pflow */
-	export_pflow_ptr = NULL;
-	/* pflog */
-	pflog_packet_ptr = NULL;
-
 	debug_pfugidhack = 0;
 
-#if 0
-	/* XXX: Are they needed here?! */
-	pfi_attach_cookie = NULL;
-	pfi_detach_cookie = NULL;
-	pfi_attach_group_cookie = NULL;
-	pfi_change_group_cookie = NULL;
-	pfi_detach_group_cookie = NULL;
-	pfi_ifaddr_event_cookie = NULL;
-#endif
-
 	return (0);
 }