Page MenuHomeFreeBSD

D9345.id24522.vs24479.diff
No OneTemporary

D9345.id24522.vs24479.diff

Index: head/sys/net/if.c
===================================================================
--- head/sys/net/if.c
+++ head/sys/net/if.c
@@ -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>
Index: head/sys/net/if_var.h
===================================================================
--- head/sys/net/if_var.h
+++ head/sys/net/if_var.h
@@ -404,6 +404,11 @@
/* 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_ */
/*
Index: head/sys/sys/eventhandler.h
===================================================================
--- head/sys/sys/eventhandler.h
+++ head/sys/sys/eventhandler.h
@@ -284,11 +284,4 @@
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_ */
Index: sys/net/if.c
===================================================================
--- sys/net/if.c
+++ sys/net/if.c
@@ -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>
Index: sys/net/if_var.h
===================================================================
--- sys/net/if_var.h
+++ sys/net/if_var.h
@@ -404,6 +404,11 @@
/* 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_ */
/*
Index: sys/sys/eventhandler.h
===================================================================
--- sys/sys/eventhandler.h
+++ sys/sys/eventhandler.h
@@ -284,11 +284,4 @@
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_ */

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 18, 9:08 PM (9 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25548587
Default Alt Text
D9345.id24522.vs24479.diff (2 KB)

Event Timeline