Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[deliverable/linux.git] / net / netfilter / nf_internals.h

diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h
index 3deec997be89e32770750abc504922761d096935..61a3c927e63cf1c9f0f9b596155e5c8a74bcd71a 100644 (file)
--- a/net/netfilter/nf_internals.h
+++ b/net/netfilter/nf_internals.h
@@ -13,26 +13,20 @@
 
 
 /* core.c */
-extern unsigned int nf_iterate(struct list_head *head,
-                               struct sk_buff *skb,
-                               unsigned int hook,
-                               const struct net_device *indev,
-                               const struct net_device *outdev,
-                               struct nf_hook_ops **elemp,
-                               int (*okfn)(struct sk_buff *),
-                               int hook_thresh);
+unsigned int nf_iterate(struct list_head *head, struct sk_buff *skb,
+                       unsigned int hook, const struct net_device *indev,
+                       const struct net_device *outdev,
+                       struct nf_hook_ops **elemp,
+                       int (*okfn)(struct sk_buff *), int hook_thresh);
 
 /* nf_queue.c */
-extern int nf_queue(struct sk_buff *skb,
-                   struct nf_hook_ops *elem,
-                   u_int8_t pf, unsigned int hook,
-                   struct net_device *indev,
-                   struct net_device *outdev,
-                   int (*okfn)(struct sk_buff *),
-                   unsigned int queuenum);
-extern int __init netfilter_queue_init(void);
+int nf_queue(struct sk_buff *skb, struct nf_hook_ops *elem, u_int8_t pf,
+            unsigned int hook, struct net_device *indev,
+            struct net_device *outdev, int (*okfn)(struct sk_buff *),
+            unsigned int queuenum);
+int __init netfilter_queue_init(void);
 
 /* nf_log.c */
-extern int __init netfilter_log_init(void);
+int __init netfilter_log_init(void);
 
 #endif