diff options
author | Robert Watson <rwatson@FreeBSD.org> | 2009-10-21 13:11:38 +0000 |
---|---|---|
committer | Robert Watson <rwatson@FreeBSD.org> | 2009-10-21 13:11:38 +0000 |
commit | 5e2ef9933c143854046088b377f5e4009887e20f (patch) | |
tree | 9f1c16e123b778d8aba16e3e3d20274328c50e72 | |
parent | 304762b138de244056b5c5501ebc441634d70b89 (diff) |
Merge r198198 from head to stable/8:
Line-wrap pfil.c so that it prints more nicely.
Approved by: re (kensmith)
Notes
Notes:
svn path=/stable/8/; revision=198324
-rw-r--r-- | sys/net/pfil.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/net/pfil.c b/sys/net/pfil.c index 3018eb9a5787..1e2629263ec1 100644 --- a/sys/net/pfil.c +++ b/sys/net/pfil.c @@ -49,12 +49,14 @@ static struct mtx pfil_global_lock; -MTX_SYSINIT(pfil_heads_lock, &pfil_global_lock, "pfil_head_list lock", MTX_DEF); +MTX_SYSINIT(pfil_heads_lock, &pfil_global_lock, "pfil_head_list lock", + MTX_DEF); static int pfil_list_add(pfil_list_t *, struct packet_filter_hook *, int); static int pfil_list_remove(pfil_list_t *, - int (*)(void *, struct mbuf **, struct ifnet *, int, struct inpcb *), void *); + int (*)(void *, struct mbuf **, struct ifnet *, int, struct inpcb *), + void *); LIST_HEAD(, pfil_head) pfil_head_list = LIST_HEAD_INITIALIZER(&pfil_head_list); @@ -76,7 +78,8 @@ pfil_run_hooks(struct pfil_head *ph, struct mbuf **mp, struct ifnet *ifp, for (pfh = pfil_hook_get(dir, ph); pfh != NULL; pfh = TAILQ_NEXT(pfh, pfil_link)) { if (pfh->pfil_func != NULL) { - rv = (*pfh->pfil_func)(pfh->pfil_arg, &m, ifp, dir, inp); + rv = (*pfh->pfil_func)(pfh->pfil_arg, &m, ifp, dir, + inp); if (rv != 0 || m == NULL) break; } @@ -220,8 +223,8 @@ error: * hook list. */ int -pfil_remove_hook(int (*func)(void *, struct mbuf **, struct ifnet *, int, struct inpcb *), - void *arg, int flags, struct pfil_head *ph) +pfil_remove_hook(int (*func)(void *, struct mbuf **, struct ifnet *, int, + struct inpcb *), void *arg, int flags, struct pfil_head *ph) { int err = 0; @@ -272,7 +275,8 @@ pfil_list_add(pfil_list_t *list, struct packet_filter_hook *pfh1, int flags) */ static int pfil_list_remove(pfil_list_t *list, - int (*func)(void *, struct mbuf **, struct ifnet *, int, struct inpcb *), void *arg) + int (*func)(void *, struct mbuf **, struct ifnet *, int, struct inpcb *), + void *arg) { struct packet_filter_hook *pfh; |