nfsd4: simplify lease/grace interaction

[safe/jmp/linux-2.6] / net / netfilter / nf_internals.h

diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h
index 6bdee29..bf66099 100644 (file)
--- a/net/netfilter/nf_internals.h
+++ b/net/netfilter/nf_internals.h
@@ -1,7 +1,6 @@
 #ifndef _NF_INTERNALS_H
 #define _NF_INTERNALS_H
 
-#include <linux/config.h>
 #include <linux/list.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
@@ -15,8 +14,8 @@
 
 /* core.c */
 extern unsigned int nf_iterate(struct list_head *head,
-                               struct sk_buff **skb,
-                               int hook,
+                               struct sk_buff *skb,
+                               unsigned int hook,
                                const struct net_device *indev,
                                const struct net_device *outdev,
                                struct list_head **i,
@@ -24,9 +23,9 @@ extern unsigned int nf_iterate(struct list_head *head,
                                int hook_thresh);
 
 /* nf_queue.c */
-extern int nf_queue(struct sk_buff **skb, 
-                   struct list_head *elem, 
-                   int pf, unsigned int hook,
+extern int nf_queue(struct sk_buff *skb,
+                   struct list_head *elem,
+                   u_int8_t pf, unsigned int hook,
                    struct net_device *indev,
                    struct net_device *outdev,
                    int (*okfn)(struct sk_buff *),