svn commit: r198324 - in stable/8/sys: . amd64/include/xen
cddl/contrib/opensolaris contrib/dev/acpica contrib/pf
dev/xen/xenpci net
Robert Watson
rwatson at FreeBSD.org
Wed Oct 21 13:11:38 UTC 2009
Author: rwatson
Date: Wed Oct 21 13:11:38 2009
New Revision: 198324
URL: http://svn.freebsd.org/changeset/base/198324
Log:
Merge r198198 from head to stable/8:
Line-wrap pfil.c so that it prints more nicely.
Approved by: re (kensmith)
Modified:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/net/pfil.c
Modified: stable/8/sys/net/pfil.c
==============================================================================
--- stable/8/sys/net/pfil.c Wed Oct 21 13:10:02 2009 (r198323)
+++ stable/8/sys/net/pfil.c Wed Oct 21 13:11:38 2009 (r198324)
@@ -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, str
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
*/
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;
More information about the svn-src-stable-8
mailing list