diff options
| author | glebius <glebius@FreeBSD.org> | 2013-10-28 07:45:03 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2013-10-28 07:45:03 +0000 |
| commit | 9c54cb7e8ec1367dd664b17bceb913d02f9e109f (patch) | |
| tree | 46381b40003dbc94fc775ef0d09c8455a9540cfb | |
| parent | f469ae1d459eb17461e1fdfa9af613fb107e7be2 (diff) | |
| download | FreeBSD-src-9c54cb7e8ec1367dd664b17bceb913d02f9e109f.zip FreeBSD-src-9c54cb7e8ec1367dd664b17bceb913d02f9e109f.tar.gz | |
Instead of putting ifnet declaration into eventhandler.h, move
bpf(4) and vlan(4) related event declarations to bpf.h and
if_vlan_var.h. To avoid dependency on eventhandler.h, protect
these declarations with ifdef SYS_EVENTHANDLER_H.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
| -rw-r--r-- | sys/net/bpf.h | 8 | ||||
| -rw-r--r-- | sys/net/if_vlan_var.h | 8 | ||||
| -rw-r--r-- | sys/sys/eventhandler.h | 13 |
3 files changed, 16 insertions, 13 deletions
diff --git a/sys/net/bpf.h b/sys/net/bpf.h index e362f16..1abd5de 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -1310,4 +1310,12 @@ bpf_peers_present(struct bpf_if *bpf) */ #define BPF_MEMWORDS 16 +#ifdef SYS_EVENTHANDLER_H +/* BPF attach/detach events */ +struct ifnet; +typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */, + int /* 1 =>'s attach */); +EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn); +#endif /* SYS_EVENTHANDLER_H */ + #endif /* _NET_BPF_H_ */ diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index 4eb3b09..0e8d8ee 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -150,6 +150,14 @@ extern int (*vlan_tag_p)(struct ifnet *, uint16_t *); extern int (*vlan_setcookie_p)(struct ifnet *, void *); extern void *(*vlan_cookie_p)(struct ifnet *); +#ifdef SYS_EVENTHANDLER_H +/* VLAN state change events */ +typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t); +typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t); +EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn); +EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn); +#endif /* SYS_EVENTHANDLER_H */ + #endif /* _KERNEL */ #endif /* _NET_IF_VLAN_VAR_H_ */ diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index f1d06b5..fdf662e 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -203,19 +203,6 @@ typedef void (*vfs_unmounted_notify_fn)(void *, struct mount *, EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn); EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_notify_fn); -/* VLAN state change events */ -struct ifnet; -typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t); -typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t); -EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn); -EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn); - -/* BPF attach/detach events */ -struct ifnet; -typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */, - int /* 1 =>'s attach */); -EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn); - /* * Process events * process_fork and exit handlers are called without Giant. |
