Author: rwatson
Date: Tue Oct 20 18:54:51 2009
New Revision: 198302
URL: http://svn.freebsd.org/changeset/base/198302
Log:
Merge r198218 from head to stable/8:
Sort function prototypes in pfil.h, clean up white space, and better
align fields for printing.
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.h
Modified: stable/8/sys/net/pfil.h
==============================================================================
--- stable/8/sys/net/pfil.h Tue Oct 20 17:55:42 2009 (r198301)
+++ stable/8/sys/net/pfil.h Tue Oct 20 18:54:51 2009 (r198302)
@@ -50,7 +50,7 @@ struct inpcb;
struct packet_filter_hook {
TAILQ_ENTRY(packet_filter_hook) pfil_link;
int (*pfil_func)(void *, struct mbuf **, struct ifnet *, int,
- struct inpcb *);
+ struct inpcb *);
void *pfil_arg;
int pfil_flags;
};
@@ -80,14 +80,13 @@ struct pfil_head {
LIST_ENTRY(pfil_head) ph_list;
};
+int pfil_add_hook(int (*func)(void *, struct mbuf **, struct ifnet *,
+ int, struct inpcb *), void *, int, struct pfil_head *);
+int pfil_remove_hook(int (*func)(void *, struct mbuf **, struct ifnet *,
+ int, struct inpcb *), void *, int, struct pfil_head *);
int pfil_run_hooks(struct pfil_head *, struct mbuf **, struct ifnet *,
int, struct inpcb *inp);
-int pfil_add_hook(int (*func)(void *, struct mbuf **,
- struct ifnet *, int, struct inpcb *), void *, int, struct pfil_head
*);
-int pfil_remove_hook(int (*func)(void *, struct mbuf **,
- struct ifnet *, int, struct inpcb *), void *, int, struct pfil_head
*);
-
int pfil_head_register(struct pfil_head *);
int pfil_head_unregister(struct pfil_head *);
@@ -107,6 +106,7 @@ struct pfil_head *pfil_head_get(int, u_l
static __inline struct packet_filter_hook *
pfil_hook_get(int dir, struct pfil_head *ph)
{
+
if (dir == PFIL_IN)
return (TAILQ_FIRST(&ph->ph_in));
else if (dir == PFIL_OUT)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
