Date: Mon, 28 Oct 2013 07:45:04 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257242 - in head/sys: net sys Message-ID: <201310280745.r9S7j4XX050440@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Mon Oct 28 07:45:03 2013 New Revision: 257242 URL: http://svnweb.freebsd.org/changeset/base/257242 Log: 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. Modified: head/sys/net/bpf.h head/sys/net/if_vlan_var.h head/sys/sys/eventhandler.h Modified: head/sys/net/bpf.h ============================================================================== --- head/sys/net/bpf.h Mon Oct 28 07:29:16 2013 (r257241) +++ head/sys/net/bpf.h Mon Oct 28 07:45:03 2013 (r257242) @@ -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_ */ Modified: head/sys/net/if_vlan_var.h ============================================================================== --- head/sys/net/if_vlan_var.h Mon Oct 28 07:29:16 2013 (r257241) +++ head/sys/net/if_vlan_var.h Mon Oct 28 07:45:03 2013 (r257242) @@ -150,6 +150,14 @@ extern int (*vlan_tag_p)(struct ifnet *, 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_ */ Modified: head/sys/sys/eventhandler.h ============================================================================== --- head/sys/sys/eventhandler.h Mon Oct 28 07:29:16 2013 (r257241) +++ head/sys/sys/eventhandler.h Mon Oct 28 07:45:03 2013 (r257242) @@ -203,19 +203,6 @@ typedef void (*vfs_unmounted_notify_fn)( 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310280745.r9S7j4XX050440>