d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instead of putting ifnet declaration into eventhandler.h, move

Browse Source 
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.
This commit is contained in:
Gleb Smirnoff 2013-10-28 07:45:03 +00:00
parent c3322cb91c
commit 7ced9c2f66
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net/bpf.h
View File

@ -1310,4 +1310,12 @@ bpf_peers_present(struct bpf_if *bpf)
*/ */
#define BPF_MEMWORDS 16 #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_ */ #endif /* _NET_BPF_H_ */

8
sys/net/if_vlan_var.h
View File

@ -150,6 +150,14 @@ extern int (*vlan_tag_p)(struct ifnet *, uint16_t *);
extern int (*vlan_setcookie_p)(struct ifnet *, void *); extern int (*vlan_setcookie_p)(struct ifnet *, void *);
extern void *(*vlan_cookie_p)(struct ifnet *); 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 /* _KERNEL */
#endif /* _NET_IF_VLAN_VAR_H_ */ #endif /* _NET_IF_VLAN_VAR_H_ */

13
sys/sys/eventhandler.h
View File

@ -203,19 +203,6 @@ typedef void (*vfs_unmounted_notify_fn)(void *, struct mount *,
EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn); EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn);
EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_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 events
* process_fork and exit handlers are called without Giant. * process_fork and exit handlers are called without Giant.