svn commit: r312916 - in head/sys: net sys

[Dexuan Cui]

Author: dexuan
Date: Sat Jan 28 07:26:42 2017
New Revision: 312916
URL: https://svnweb.freebsd.org/changeset/base/312916

Log:
  ifnet: move the new ifnet_event EVENTHANDLER_DECLARE to net/if_var.h
  
  Thank glebius for pointing this out:
  "The network stuff shall not be added to sys/eventhandler.h"
  
  Reviewed by:	David_A_Bright_DELL.com, sephe, glebius
  Approved by:	sephe (mentor)
  MFC after:	2 weeks
  Sponsored by:	Microsoft
  Differential Revision:	https://reviews.freebsd.org/D9345

Modified:
  head/sys/net/if.c
  head/sys/net/if_var.h
  head/sys/sys/eventhandler.h

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Sat Jan 28 05:07:55 2017	(r312915)
+++ head/sys/net/if.c	Sat Jan 28 07:26:42 2017	(r312916)
@@ -59,7 +59,6 @@
 #include <sys/domain.h>
 #include <sys/jail.h>
 #include <sys/priv.h>
-#include <sys/eventhandler.h>
 
 #include <machine/stdarg.h>
 #include <vm/uma.h>

Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h	Sat Jan 28 05:07:55 2017	(r312915)
+++ head/sys/net/if_var.h	Sat Jan 28 07:26:42 2017	(r312916)
@@ -404,6 +404,11 @@ EVENTHANDLER_DECLARE(ifnet_departure_eve
 /* Interface link state change event */
 typedef void (*ifnet_link_event_handler_t)(void *, struct ifnet *, int);
 EVENTHANDLER_DECLARE(ifnet_link_event, ifnet_link_event_handler_t);
+/* Interface up/down event */
+#define IFNET_EVENT_UP		0
+#define IFNET_EVENT_DOWN	1
+typedef void (*ifnet_event_fn)(void *, struct ifnet *ifp, int event);
+EVENTHANDLER_DECLARE(ifnet_event, ifnet_event_fn);
 #endif /* _SYS_EVENTHANDLER_H_ */
 
 /*

Modified: head/sys/sys/eventhandler.h
==============================================================================
--- head/sys/sys/eventhandler.h	Sat Jan 28 05:07:55 2017	(r312915)
+++ head/sys/sys/eventhandler.h	Sat Jan 28 07:26:42 2017	(r312916)
@@ -284,11 +284,4 @@ typedef void (*swapoff_fn)(void *, struc
 EVENTHANDLER_DECLARE(swapon, swapon_fn);
 EVENTHANDLER_DECLARE(swapoff, swapoff_fn);
 
-/* ifup/ifdown events */
-#define IFNET_EVENT_UP		0
-#define IFNET_EVENT_DOWN	1
-struct ifnet;
-typedef void (*ifnet_event_fn)(void *, struct ifnet *ifp, int event);
-EVENTHANDLER_DECLARE(ifnet_event, ifnet_event_fn);
-
 #endif /* _SYS_EVENTHANDLER_H_ */