netfilter: Remove extern from function prototypes

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

netfilter: Remove extern from function prototypes

There are a mix of function prototypes with and without extern
in the kernel sources. Standardize on not using extern for
function prototypes.

Function prototypes don't need to be written with extern.
extern is assumed by the compiler. Its use is as unnecessary as
using auto to declare automatic/local variables in a block.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by

David S. Miller 12 years ago 4e77be46 0e418f94

+206 -235

22 changed files

expand all collapse all

include

net

netfilter

ipv4

nf_conntrack_ipv4.h

nf_defrag_ipv4.h

ipv6

nf_defrag_ipv6.h

nf_conntrack.h

nf_conntrack_acct.h

nf_conntrack_core.h

nf_conntrack_ecache.h

nf_conntrack_extend.h

nf_conntrack_helper.h

nf_conntrack_l3proto.h

nf_conntrack_l4proto.h

nf_conntrack_seqadj.h

nf_conntrack_synproxy.h

nf_conntrack_timeout.h

nf_conntrack_timestamp.h

nf_nat.h

nf_nat_core.h

nf_nat_helper.h

nf_nat_l3proto.h

nf_nat_l4proto.h

nf_queue.h

xt_rateest.h

+3 -3

include/net/netfilter/ipv4/nf_conntrack_ipv4.h

reviewed

··· 16 16 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4; 17 17 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp; 18 18 19 19 - extern int nf_conntrack_ipv4_compat_init(void); 20 20 - extern void nf_conntrack_ipv4_compat_fini(void); 19 19 + int nf_conntrack_ipv4_compat_init(void); 20 20 + void nf_conntrack_ipv4_compat_fini(void); 21 21 22 22 - extern void need_ipv4_conntrack(void); 22 22 + void need_ipv4_conntrack(void); 23 23 24 24 #endif /*_NF_CONNTRACK_IPV4_H*/

+1 -1

include/net/netfilter/ipv4/nf_defrag_ipv4.h

reviewed

··· 1 1 #ifndef _NF_DEFRAG_IPV4_H 2 2 #define _NF_DEFRAG_IPV4_H 3 3 4 4 - extern void nf_defrag_ipv4_enable(void); 4 4 + void nf_defrag_ipv4_enable(void); 5 5 6 6 #endif /* _NF_DEFRAG_IPV4_H */

+7 -8

include/net/netfilter/ipv6/nf_defrag_ipv6.h

reviewed

··· 1 1 #ifndef _NF_DEFRAG_IPV6_H 2 2 #define _NF_DEFRAG_IPV6_H 3 3 4 4 - extern void nf_defrag_ipv6_enable(void); 4 4 + void nf_defrag_ipv6_enable(void); 5 5 6 6 - extern int nf_ct_frag6_init(void); 7 7 - extern void nf_ct_frag6_cleanup(void); 8 8 - extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user); 9 9 - extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb, 10 10 - struct net_device *in, 11 11 - struct net_device *out, 12 12 - int (*okfn)(struct sk_buff *)); 6 6 + int nf_ct_frag6_init(void); 7 7 + void nf_ct_frag6_cleanup(void); 8 8 + struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user); 9 9 + void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb, 10 10 + struct net_device *in, struct net_device *out, 11 11 + int (*okfn)(struct sk_buff *)); 13 12 14 13 struct inet_frags_ctl; 15 14

+30 -39

include/net/netfilter/nf_conntrack.h

reviewed

··· 139 139 } 140 140 141 141 /* Alter reply tuple (maybe alter helper). */ 142 142 - extern void 143 143 - nf_conntrack_alter_reply(struct nf_conn *ct, 144 144 - const struct nf_conntrack_tuple *newreply); 142 142 + void nf_conntrack_alter_reply(struct nf_conn *ct, 143 143 + const struct nf_conntrack_tuple *newreply); 145 144 146 145 /* Is this tuple taken? (ignoring any belonging to the given 147 146 conntrack). */ 148 148 - extern int 149 149 - nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple, 150 150 - const struct nf_conn *ignored_conntrack); 147 147 + int nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple, 148 148 + const struct nf_conn *ignored_conntrack); 151 149 152 150 /* Return conntrack_info and tuple hash for given skb. */ 153 151 static inline struct nf_conn * ··· 163 165 } 164 166 165 167 /* Protocol module loading */ 166 166 - extern int nf_ct_l3proto_try_module_get(unsigned short l3proto); 167 167 - extern void nf_ct_l3proto_module_put(unsigned short l3proto); 168 168 + int nf_ct_l3proto_try_module_get(unsigned short l3proto); 169 169 + void nf_ct_l3proto_module_put(unsigned short l3proto); 168 170 169 171 /* 170 172 * Allocate a hashtable of hlist_head (if nulls == 0), 171 173 * or hlist_nulls_head (if nulls == 1) 172 174 */ 173 173 - extern void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls); 175 175 + void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls); 174 176 175 175 - extern void nf_ct_free_hashtable(void *hash, unsigned int size); 177 177 + void nf_ct_free_hashtable(void *hash, unsigned int size); 176 178 177 177 - extern struct nf_conntrack_tuple_hash * 179 179 + struct nf_conntrack_tuple_hash * 178 180 __nf_conntrack_find(struct net *net, u16 zone, 179 181 const struct nf_conntrack_tuple *tuple); 180 182 181 181 - extern int nf_conntrack_hash_check_insert(struct nf_conn *ct); 183 183 + int nf_conntrack_hash_check_insert(struct nf_conn *ct); 182 184 bool nf_ct_delete(struct nf_conn *ct, u32 pid, int report); 183 185 184 184 - extern void nf_conntrack_flush_report(struct net *net, u32 portid, int report); 186 186 + void nf_conntrack_flush_report(struct net *net, u32 portid, int report); 185 187 186 186 - extern bool nf_ct_get_tuplepr(const struct sk_buff *skb, 187 187 - unsigned int nhoff, u_int16_t l3num, 188 188 - struct nf_conntrack_tuple *tuple); 189 189 - extern bool nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse, 190 190 - const struct nf_conntrack_tuple *orig); 188 188 + bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff, 189 189 + u_int16_t l3num, struct nf_conntrack_tuple *tuple); 190 190 + bool nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse, 191 191 + const struct nf_conntrack_tuple *orig); 191 192 192 192 - extern void __nf_ct_refresh_acct(struct nf_conn *ct, 193 193 - enum ip_conntrack_info ctinfo, 194 194 - const struct sk_buff *skb, 195 195 - unsigned long extra_jiffies, 196 196 - int do_acct); 193 193 + void __nf_ct_refresh_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo, 194 194 + const struct sk_buff *skb, 195 195 + unsigned long extra_jiffies, int do_acct); 197 196 198 197 /* Refresh conntrack for this many jiffies and do accounting */ 199 198 static inline void nf_ct_refresh_acct(struct nf_conn *ct, ··· 209 214 __nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, 0); 210 215 } 211 216 212 212 - extern bool __nf_ct_kill_acct(struct nf_conn *ct, 213 213 - enum ip_conntrack_info ctinfo, 214 214 - const struct sk_buff *skb, 215 215 - int do_acct); 217 217 + bool __nf_ct_kill_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo, 218 218 + const struct sk_buff *skb, int do_acct); 216 219 217 220 /* kill conntrack and do accounting */ 218 221 static inline bool nf_ct_kill_acct(struct nf_conn *ct, ··· 237 244 { 238 245 return &__raw_get_cpu_var(nf_conntrack_untracked); 239 246 } 240 240 - extern void nf_ct_untracked_status_or(unsigned long bits); 247 247 + void nf_ct_untracked_status_or(unsigned long bits); 241 248 242 249 /* Iterate over all conntracks: if iter returns true, it's deleted. */ 243 243 - extern void 244 244 - nf_ct_iterate_cleanup(struct net *net, 245 245 - int (*iter)(struct nf_conn *i, void *data), 246 246 - void *data, u32 portid, int report); 247 247 - extern void nf_conntrack_free(struct nf_conn *ct); 248 248 - extern struct nf_conn * 249 249 - nf_conntrack_alloc(struct net *net, u16 zone, 250 250 - const struct nf_conntrack_tuple *orig, 251 251 - const struct nf_conntrack_tuple *repl, 252 252 - gfp_t gfp); 250 250 + void nf_ct_iterate_cleanup(struct net *net, 251 251 + int (*iter)(struct nf_conn *i, void *data), 252 252 + void *data, u32 portid, int report); 253 253 + void nf_conntrack_free(struct nf_conn *ct); 254 254 + struct nf_conn *nf_conntrack_alloc(struct net *net, u16 zone, 255 255 + const struct nf_conntrack_tuple *orig, 256 256 + const struct nf_conntrack_tuple *repl, 257 257 + gfp_t gfp); 253 258 254 259 static inline int nf_ct_is_template(const struct nf_conn *ct) 255 260 { ··· 278 287 279 288 struct kernel_param; 280 289 281 281 - extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp); 290 290 + int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp); 282 291 extern unsigned int nf_conntrack_htable_size; 283 292 extern unsigned int nf_conntrack_max; 284 293 extern unsigned int nf_conntrack_hash_rnd;

+6 -6

include/net/netfilter/nf_conntrack_acct.h

reviewed

··· 42 42 return acct; 43 43 }; 44 44 45 45 - extern unsigned int 46 46 - seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir); 45 45 + unsigned int seq_print_acct(struct seq_file *s, const struct nf_conn *ct, 46 46 + int dir); 47 47 48 48 /* Check if connection tracking accounting is enabled */ 49 49 static inline bool nf_ct_acct_enabled(struct net *net) ··· 57 57 net->ct.sysctl_acct = enable; 58 58 } 59 59 60 60 - extern int nf_conntrack_acct_pernet_init(struct net *net); 61 61 - extern void nf_conntrack_acct_pernet_fini(struct net *net); 60 60 + int nf_conntrack_acct_pernet_init(struct net *net); 61 61 + void nf_conntrack_acct_pernet_fini(struct net *net); 62 62 63 63 - extern int nf_conntrack_acct_init(void); 64 64 - extern void nf_conntrack_acct_fini(void); 63 63 + int nf_conntrack_acct_init(void); 64 64 + void nf_conntrack_acct_fini(void); 65 65 #endif /* _NF_CONNTRACK_ACCT_H */

+24 -31

include/net/netfilter/nf_conntrack_core.h

reviewed

··· 20 20 /* This header is used to share core functionality between the 21 21 standalone connection tracking module, and the compatibility layer's use 22 22 of connection tracking. */ 23 23 - extern unsigned int nf_conntrack_in(struct net *net, 24 24 - u_int8_t pf, 25 25 - unsigned int hooknum, 26 26 - struct sk_buff *skb); 23 23 + unsigned int nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum, 24 24 + struct sk_buff *skb); 27 25 28 28 - extern int nf_conntrack_init_net(struct net *net); 29 29 - extern void nf_conntrack_cleanup_net(struct net *net); 30 30 - extern void nf_conntrack_cleanup_net_list(struct list_head *net_exit_list); 26 26 + int nf_conntrack_init_net(struct net *net); 27 27 + void nf_conntrack_cleanup_net(struct net *net); 28 28 + void nf_conntrack_cleanup_net_list(struct list_head *net_exit_list); 31 29 32 32 - extern int nf_conntrack_proto_pernet_init(struct net *net); 33 33 - extern void nf_conntrack_proto_pernet_fini(struct net *net); 30 30 + int nf_conntrack_proto_pernet_init(struct net *net); 31 31 + void nf_conntrack_proto_pernet_fini(struct net *net); 34 32 35 35 - extern int nf_conntrack_proto_init(void); 36 36 - extern void nf_conntrack_proto_fini(void); 33 33 + int nf_conntrack_proto_init(void); 34 34 + void nf_conntrack_proto_fini(void); 37 35 38 38 - extern int nf_conntrack_init_start(void); 39 39 - extern void nf_conntrack_cleanup_start(void); 36 36 + int nf_conntrack_init_start(void); 37 37 + void nf_conntrack_cleanup_start(void); 40 38 41 41 - extern void nf_conntrack_init_end(void); 42 42 - extern void nf_conntrack_cleanup_end(void); 39 39 + void nf_conntrack_init_end(void); 40 40 + void nf_conntrack_cleanup_end(void); 43 41 44 44 - extern bool 45 45 - nf_ct_get_tuple(const struct sk_buff *skb, 46 46 - unsigned int nhoff, 47 47 - unsigned int dataoff, 48 48 - u_int16_t l3num, 49 49 - u_int8_t protonum, 50 50 - struct nf_conntrack_tuple *tuple, 51 51 - const struct nf_conntrack_l3proto *l3proto, 52 52 - const struct nf_conntrack_l4proto *l4proto); 42 42 + bool nf_ct_get_tuple(const struct sk_buff *skb, unsigned int nhoff, 43 43 + unsigned int dataoff, u_int16_t l3num, u_int8_t protonum, 44 44 + struct nf_conntrack_tuple *tuple, 45 45 + const struct nf_conntrack_l3proto *l3proto, 46 46 + const struct nf_conntrack_l4proto *l4proto); 53 47 54 54 - extern bool 55 55 - nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse, 56 56 - const struct nf_conntrack_tuple *orig, 57 57 - const struct nf_conntrack_l3proto *l3proto, 58 58 - const struct nf_conntrack_l4proto *l4proto); 48 48 + bool nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse, 49 49 + const struct nf_conntrack_tuple *orig, 50 50 + const struct nf_conntrack_l3proto *l3proto, 51 51 + const struct nf_conntrack_l4proto *l4proto); 59 52 60 53 /* Find a connection corresponding to a tuple. */ 61 61 - extern struct nf_conntrack_tuple_hash * 54 54 + struct nf_conntrack_tuple_hash * 62 55 nf_conntrack_find_get(struct net *net, u16 zone, 63 56 const struct nf_conntrack_tuple *tuple); 64 57 65 65 - extern int __nf_conntrack_confirm(struct sk_buff *skb); 58 58 + int __nf_conntrack_confirm(struct sk_buff *skb); 66 59 67 60 /* Confirm a connection: returns NF_DROP if packet must be dropped. */ 68 61 static inline int nf_conntrack_confirm(struct sk_buff *skb)

+13 -9

include/net/netfilter/nf_conntrack_ecache.h

reviewed

··· 68 68 int (*fcn)(unsigned int events, struct nf_ct_event *item); 69 69 }; 70 70 71 71 - extern int nf_conntrack_register_notifier(struct net *net, struct nf_ct_event_notifier *nb); 72 72 - extern void nf_conntrack_unregister_notifier(struct net *net, struct nf_ct_event_notifier *nb); 71 71 + int nf_conntrack_register_notifier(struct net *net, 72 72 + struct nf_ct_event_notifier *nb); 73 73 + void nf_conntrack_unregister_notifier(struct net *net, 74 74 + struct nf_ct_event_notifier *nb); 73 75 74 74 - extern void nf_ct_deliver_cached_events(struct nf_conn *ct); 76 76 + void nf_ct_deliver_cached_events(struct nf_conn *ct); 75 77 76 78 static inline void 77 79 nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct) ··· 168 166 int (*fcn)(unsigned int events, struct nf_exp_event *item); 169 167 }; 170 168 171 171 - extern int nf_ct_expect_register_notifier(struct net *net, struct nf_exp_event_notifier *nb); 172 172 - extern void nf_ct_expect_unregister_notifier(struct net *net, struct nf_exp_event_notifier *nb); 169 169 + int nf_ct_expect_register_notifier(struct net *net, 170 170 + struct nf_exp_event_notifier *nb); 171 171 + void nf_ct_expect_unregister_notifier(struct net *net, 172 172 + struct nf_exp_event_notifier *nb); 173 173 174 174 static inline void 175 175 nf_ct_expect_event_report(enum ip_conntrack_expect_events event, ··· 211 207 nf_ct_expect_event_report(event, exp, 0, 0); 212 208 } 213 209 214 214 - extern int nf_conntrack_ecache_pernet_init(struct net *net); 215 215 - extern void nf_conntrack_ecache_pernet_fini(struct net *net); 210 210 + int nf_conntrack_ecache_pernet_init(struct net *net); 211 211 + void nf_conntrack_ecache_pernet_fini(struct net *net); 216 212 217 217 - extern int nf_conntrack_ecache_init(void); 218 218 - extern void nf_conntrack_ecache_fini(void); 213 213 + int nf_conntrack_ecache_init(void); 214 214 + void nf_conntrack_ecache_fini(void); 219 215 #else /* CONFIG_NF_CONNTRACK_EVENTS */ 220 216 221 217 static inline void nf_conntrack_event_cache(enum ip_conntrack_events event,

+1 -1

include/net/netfilter/nf_conntrack_extend.h

reviewed

··· 73 73 ((id##_TYPE *)__nf_ct_ext_find((ext), (id))) 74 74 75 75 /* Destroy all relationships */ 76 76 - extern void __nf_ct_ext_destroy(struct nf_conn *ct); 76 76 + void __nf_ct_ext_destroy(struct nf_conn *ct); 77 77 static inline void nf_ct_ext_destroy(struct nf_conn *ct) 78 78 { 79 79 if (ct->ext)

+21 -19

include/net/netfilter/nf_conntrack_helper.h

reviewed

··· 52 52 unsigned int queue_num; /* For user-space helpers. */ 53 53 }; 54 54 55 55 - extern struct nf_conntrack_helper * 56 56 - __nf_conntrack_helper_find(const char *name, u16 l3num, u8 protonum); 55 55 + struct nf_conntrack_helper *__nf_conntrack_helper_find(const char *name, 56 56 + u16 l3num, u8 protonum); 57 57 58 58 - extern struct nf_conntrack_helper * 59 59 - nf_conntrack_helper_try_module_get(const char *name, u16 l3num, u8 protonum); 58 58 + struct nf_conntrack_helper *nf_conntrack_helper_try_module_get(const char *name, 59 59 + u16 l3num, 60 60 + u8 protonum); 60 61 61 61 - extern int nf_conntrack_helper_register(struct nf_conntrack_helper *); 62 62 - extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *); 62 62 + int nf_conntrack_helper_register(struct nf_conntrack_helper *); 63 63 + void nf_conntrack_helper_unregister(struct nf_conntrack_helper *); 63 64 64 64 - extern struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, struct nf_conntrack_helper *helper, gfp_t gfp); 65 65 + struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, 66 66 + struct nf_conntrack_helper *helper, 67 67 + gfp_t gfp); 65 68 66 66 - extern int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl, 67 67 - gfp_t flags); 69 69 + int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl, 70 70 + gfp_t flags); 68 71 69 69 - extern void nf_ct_helper_destroy(struct nf_conn *ct); 72 72 + void nf_ct_helper_destroy(struct nf_conn *ct); 70 73 71 74 static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct) 72 75 { ··· 85 82 return (void *)help->data; 86 83 } 87 84 88 88 - extern int nf_conntrack_helper_pernet_init(struct net *net); 89 89 - extern void nf_conntrack_helper_pernet_fini(struct net *net); 85 85 + int nf_conntrack_helper_pernet_init(struct net *net); 86 86 + void nf_conntrack_helper_pernet_fini(struct net *net); 90 87 91 91 - extern int nf_conntrack_helper_init(void); 92 92 - extern void nf_conntrack_helper_fini(void); 88 88 + int nf_conntrack_helper_init(void); 89 89 + void nf_conntrack_helper_fini(void); 93 90 94 94 - extern int nf_conntrack_broadcast_help(struct sk_buff *skb, 95 95 - unsigned int protoff, 96 96 - struct nf_conn *ct, 97 97 - enum ip_conntrack_info ctinfo, 98 98 - unsigned int timeout); 91 91 + int nf_conntrack_broadcast_help(struct sk_buff *skb, unsigned int protoff, 92 92 + struct nf_conn *ct, 93 93 + enum ip_conntrack_info ctinfo, 94 94 + unsigned int timeout); 99 95 100 96 struct nf_ct_helper_expectfn { 101 97 struct list_head head;

+8 -8

include/net/netfilter/nf_conntrack_l3proto.h

reviewed

··· 77 77 extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX]; 78 78 79 79 /* Protocol pernet registration. */ 80 80 - extern int nf_ct_l3proto_pernet_register(struct net *net, 81 81 - struct nf_conntrack_l3proto *proto); 82 82 - extern void nf_ct_l3proto_pernet_unregister(struct net *net, 83 83 - struct nf_conntrack_l3proto *proto); 80 80 + int nf_ct_l3proto_pernet_register(struct net *net, 81 81 + struct nf_conntrack_l3proto *proto); 82 82 + void nf_ct_l3proto_pernet_unregister(struct net *net, 83 83 + struct nf_conntrack_l3proto *proto); 84 84 85 85 /* Protocol global registration. */ 86 86 - extern int nf_ct_l3proto_register(struct nf_conntrack_l3proto *proto); 87 87 - extern void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto); 86 86 + int nf_ct_l3proto_register(struct nf_conntrack_l3proto *proto); 87 87 + void nf_ct_l3proto_unregister(struct nf_conntrack_l3proto *proto); 88 88 89 89 - extern struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto); 90 90 - extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p); 89 89 + struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto); 90 90 + void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p); 91 91 92 92 /* Existing built-in protocols */ 93 93 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;

+16 -16

include/net/netfilter/nf_conntrack_l4proto.h

reviewed

··· 114 114 115 115 #define MAX_NF_CT_PROTO 256 116 116 117 117 - extern struct nf_conntrack_l4proto * 118 118 - __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto); 117 117 + struct nf_conntrack_l4proto *__nf_ct_l4proto_find(u_int16_t l3proto, 118 118 + u_int8_t l4proto); 119 119 120 120 - extern struct nf_conntrack_l4proto * 121 121 - nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t l4proto); 122 122 - extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p); 120 120 + struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u_int16_t l3proto, 121 121 + u_int8_t l4proto); 122 122 + void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p); 123 123 124 124 /* Protocol pernet registration. */ 125 125 - extern int nf_ct_l4proto_pernet_register(struct net *net, 126 126 - struct nf_conntrack_l4proto *proto); 127 127 - extern void nf_ct_l4proto_pernet_unregister(struct net *net, 128 128 - struct nf_conntrack_l4proto *proto); 125 125 + int nf_ct_l4proto_pernet_register(struct net *net, 126 126 + struct nf_conntrack_l4proto *proto); 127 127 + void nf_ct_l4proto_pernet_unregister(struct net *net, 128 128 + struct nf_conntrack_l4proto *proto); 129 129 130 130 /* Protocol global registration. */ 131 131 - extern int nf_ct_l4proto_register(struct nf_conntrack_l4proto *proto); 132 132 - extern void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *proto); 131 131 + int nf_ct_l4proto_register(struct nf_conntrack_l4proto *proto); 132 132 + void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *proto); 133 133 134 134 static inline void nf_ct_kfree_compat_sysctl_table(struct nf_proto_net *pn) 135 135 { ··· 140 140 } 141 141 142 142 /* Generic netlink helpers */ 143 143 - extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, 144 144 - const struct nf_conntrack_tuple *tuple); 145 145 - extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[], 146 146 - struct nf_conntrack_tuple *t); 147 147 - extern int nf_ct_port_nlattr_tuple_size(void); 143 143 + int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, 144 144 + const struct nf_conntrack_tuple *tuple); 145 145 + int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[], 146 146 + struct nf_conntrack_tuple *t); 147 147 + int nf_ct_port_nlattr_tuple_size(void); 148 148 extern const struct nla_policy nf_ct_port_nla_policy[]; 149 149 150 150 #ifdef CONFIG_SYSCTL

+11 -15

include/net/netfilter/nf_conntrack_seqadj.h

reviewed

··· 30 30 return nf_ct_ext_add(ct, NF_CT_EXT_SEQADJ, GFP_ATOMIC); 31 31 } 32 32 33 33 - extern int nf_ct_seqadj_init(struct nf_conn *ct, enum ip_conntrack_info ctinfo, 34 34 - s32 off); 35 35 - extern int nf_ct_seqadj_set(struct nf_conn *ct, enum ip_conntrack_info ctinfo, 36 36 - __be32 seq, s32 off); 37 37 - extern void nf_ct_tcp_seqadj_set(struct sk_buff *skb, 38 38 - struct nf_conn *ct, 39 39 - enum ip_conntrack_info ctinfo, 40 40 - s32 off); 33 33 + int nf_ct_seqadj_init(struct nf_conn *ct, enum ip_conntrack_info ctinfo, 34 34 + s32 off); 35 35 + int nf_ct_seqadj_set(struct nf_conn *ct, enum ip_conntrack_info ctinfo, 36 36 + __be32 seq, s32 off); 37 37 + void nf_ct_tcp_seqadj_set(struct sk_buff *skb, struct nf_conn *ct, 38 38 + enum ip_conntrack_info ctinfo, s32 off); 41 39 42 42 - extern int nf_ct_seq_adjust(struct sk_buff *skb, 43 43 - struct nf_conn *ct, enum ip_conntrack_info ctinfo, 44 44 - unsigned int protoff); 45 45 - extern s32 nf_ct_seq_offset(const struct nf_conn *ct, enum ip_conntrack_dir, 46 46 - u32 seq); 40 40 + int nf_ct_seq_adjust(struct sk_buff *skb, struct nf_conn *ct, 41 41 + enum ip_conntrack_info ctinfo, unsigned int protoff); 42 42 + s32 nf_ct_seq_offset(const struct nf_conn *ct, enum ip_conntrack_dir, u32 seq); 47 43 48 48 - extern int nf_conntrack_seqadj_init(void); 49 49 - extern void nf_conntrack_seqadj_fini(void); 44 44 + int nf_conntrack_seqadj_init(void); 45 45 + void nf_conntrack_seqadj_fini(void); 50 46 51 47 #endif /* _NF_CONNTRACK_SEQADJ_H */

+13 -15

include/net/netfilter/nf_conntrack_synproxy.h

reviewed

··· 56 56 57 57 struct tcphdr; 58 58 struct xt_synproxy_info; 59 59 - extern void synproxy_parse_options(const struct sk_buff *skb, unsigned int doff, 60 60 - const struct tcphdr *th, 61 61 - struct synproxy_options *opts); 62 62 - extern unsigned int synproxy_options_size(const struct synproxy_options *opts); 63 63 - extern void synproxy_build_options(struct tcphdr *th, 64 64 - const struct synproxy_options *opts); 59 59 + void synproxy_parse_options(const struct sk_buff *skb, unsigned int doff, 60 60 + const struct tcphdr *th, 61 61 + struct synproxy_options *opts); 62 62 + unsigned int synproxy_options_size(const struct synproxy_options *opts); 63 63 + void synproxy_build_options(struct tcphdr *th, 64 64 + const struct synproxy_options *opts); 65 65 66 66 - extern void synproxy_init_timestamp_cookie(const struct xt_synproxy_info *info, 67 67 - struct synproxy_options *opts); 68 68 - extern void synproxy_check_timestamp_cookie(struct synproxy_options *opts); 66 66 + void synproxy_init_timestamp_cookie(const struct xt_synproxy_info *info, 67 67 + struct synproxy_options *opts); 68 68 + void synproxy_check_timestamp_cookie(struct synproxy_options *opts); 69 69 70 70 - extern unsigned int synproxy_tstamp_adjust(struct sk_buff *skb, 71 71 - unsigned int protoff, 72 72 - struct tcphdr *th, 73 73 - struct nf_conn *ct, 74 74 - enum ip_conntrack_info ctinfo, 75 75 - const struct nf_conn_synproxy *synproxy); 70 70 + unsigned int synproxy_tstamp_adjust(struct sk_buff *skb, unsigned int protoff, 71 71 + struct tcphdr *th, struct nf_conn *ct, 72 72 + enum ip_conntrack_info ctinfo, 73 73 + const struct nf_conn_synproxy *synproxy); 76 74 77 75 #endif /* _NF_CONNTRACK_SYNPROXY_H */

+2 -2

include/net/netfilter/nf_conntrack_timeout.h

reviewed

··· 76 76 } 77 77 78 78 #ifdef CONFIG_NF_CONNTRACK_TIMEOUT 79 79 - extern int nf_conntrack_timeout_init(void); 80 80 - extern void nf_conntrack_timeout_fini(void); 79 79 + int nf_conntrack_timeout_init(void); 80 80 + void nf_conntrack_timeout_fini(void); 81 81 #else 82 82 static inline int nf_conntrack_timeout_init(void) 83 83 {

+4 -4

include/net/netfilter/nf_conntrack_timestamp.h

reviewed

··· 48 48 } 49 49 50 50 #ifdef CONFIG_NF_CONNTRACK_TIMESTAMP 51 51 - extern int nf_conntrack_tstamp_pernet_init(struct net *net); 52 52 - extern void nf_conntrack_tstamp_pernet_fini(struct net *net); 51 51 + int nf_conntrack_tstamp_pernet_init(struct net *net); 52 52 + void nf_conntrack_tstamp_pernet_fini(struct net *net); 53 53 54 54 - extern int nf_conntrack_tstamp_init(void); 55 55 - extern void nf_conntrack_tstamp_fini(void); 54 54 + int nf_conntrack_tstamp_init(void); 55 55 + void nf_conntrack_tstamp_fini(void); 56 56 #else 57 57 static inline int nf_conntrack_tstamp_pernet_init(struct net *net) 58 58 {

+5 -5

include/net/netfilter/nf_nat.h

reviewed

··· 41 41 }; 42 42 43 43 /* Set up the info structure to map into this range. */ 44 44 - extern unsigned int nf_nat_setup_info(struct nf_conn *ct, 45 45 - const struct nf_nat_range *range, 46 46 - enum nf_nat_manip_type maniptype); 44 44 + unsigned int nf_nat_setup_info(struct nf_conn *ct, 45 45 + const struct nf_nat_range *range, 46 46 + enum nf_nat_manip_type maniptype); 47 47 48 48 /* Is this tuple already taken? (not by us)*/ 49 49 - extern int nf_nat_used_tuple(const struct nf_conntrack_tuple *tuple, 50 50 - const struct nf_conn *ignored_conntrack); 49 49 + int nf_nat_used_tuple(const struct nf_conntrack_tuple *tuple, 50 50 + const struct nf_conn *ignored_conntrack); 51 51 52 52 static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct) 53 53 {

+3 -5

include/net/netfilter/nf_nat_core.h

reviewed

··· 7 7 /* This header used to share core functionality between the standalone 8 8 NAT module, and the compatibility layer's use of NAT for masquerading. */ 9 9 10 10 - extern unsigned int nf_nat_packet(struct nf_conn *ct, 11 11 - enum ip_conntrack_info ctinfo, 12 12 - unsigned int hooknum, 13 13 - struct sk_buff *skb); 10 10 + unsigned int nf_nat_packet(struct nf_conn *ct, enum ip_conntrack_info ctinfo, 11 11 + unsigned int hooknum, struct sk_buff *skb); 14 12 15 15 - extern int nf_xfrm_me_harder(struct sk_buff *skb, unsigned int family); 13 13 + int nf_xfrm_me_harder(struct sk_buff *skb, unsigned int family); 16 14 17 15 static inline int nf_nat_initialized(struct nf_conn *ct, 18 16 enum nf_nat_manip_type manip)

+11 -18

include/net/netfilter/nf_nat_helper.h

reviewed

··· 7 7 struct sk_buff; 8 8 9 9 /* These return true or false. */ 10 10 - extern int __nf_nat_mangle_tcp_packet(struct sk_buff *skb, 11 11 - struct nf_conn *ct, 12 12 - enum ip_conntrack_info ctinfo, 13 13 - unsigned int protoff, 14 14 - unsigned int match_offset, 15 15 - unsigned int match_len, 16 16 - const char *rep_buffer, 17 17 - unsigned int rep_len, bool adjust); 10 10 + int __nf_nat_mangle_tcp_packet(struct sk_buff *skb, struct nf_conn *ct, 11 11 + enum ip_conntrack_info ctinfo, 12 12 + unsigned int protoff, unsigned int match_offset, 13 13 + unsigned int match_len, const char *rep_buffer, 14 14 + unsigned int rep_len, bool adjust); 18 15 19 16 static inline int nf_nat_mangle_tcp_packet(struct sk_buff *skb, 20 17 struct nf_conn *ct, ··· 27 30 rep_buffer, rep_len, true); 28 31 } 29 32 30 30 - extern int nf_nat_mangle_udp_packet(struct sk_buff *skb, 31 31 - struct nf_conn *ct, 32 32 - enum ip_conntrack_info ctinfo, 33 33 - unsigned int protoff, 34 34 - unsigned int match_offset, 35 35 - unsigned int match_len, 36 36 - const char *rep_buffer, 37 37 - unsigned int rep_len); 33 33 + int nf_nat_mangle_udp_packet(struct sk_buff *skb, struct nf_conn *ct, 34 34 + enum ip_conntrack_info ctinfo, 35 35 + unsigned int protoff, unsigned int match_offset, 36 36 + unsigned int match_len, const char *rep_buffer, 37 37 + unsigned int rep_len); 38 38 39 39 /* Setup NAT on this expected conntrack so it follows master, but goes 40 40 * to port ct->master->saved_proto. */ 41 41 - extern void nf_nat_follow_master(struct nf_conn *ct, 42 42 - struct nf_conntrack_expect *this); 41 41 + void nf_nat_follow_master(struct nf_conn *ct, struct nf_conntrack_expect *this); 43 42 44 43 #endif

+9 -12

include/net/netfilter/nf_nat_l3proto.h

reviewed

··· 35 35 struct nf_nat_range *range); 36 36 }; 37 37 38 38 - extern int nf_nat_l3proto_register(const struct nf_nat_l3proto *); 39 39 - extern void nf_nat_l3proto_unregister(const struct nf_nat_l3proto *); 40 40 - extern const struct nf_nat_l3proto *__nf_nat_l3proto_find(u8 l3proto); 38 38 + int nf_nat_l3proto_register(const struct nf_nat_l3proto *); 39 39 + void nf_nat_l3proto_unregister(const struct nf_nat_l3proto *); 40 40 + const struct nf_nat_l3proto *__nf_nat_l3proto_find(u8 l3proto); 41 41 42 42 - extern int nf_nat_icmp_reply_translation(struct sk_buff *skb, 43 43 - struct nf_conn *ct, 44 44 - enum ip_conntrack_info ctinfo, 45 45 - unsigned int hooknum); 46 46 - extern int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, 47 47 - struct nf_conn *ct, 48 48 - enum ip_conntrack_info ctinfo, 49 49 - unsigned int hooknum, 50 50 - unsigned int hdrlen); 42 42 + int nf_nat_icmp_reply_translation(struct sk_buff *skb, struct nf_conn *ct, 43 43 + enum ip_conntrack_info ctinfo, 44 44 + unsigned int hooknum); 45 45 + int nf_nat_icmpv6_reply_translation(struct sk_buff *skb, struct nf_conn *ct, 46 46 + enum ip_conntrack_info ctinfo, 47 47 + unsigned int hooknum, unsigned int hdrlen); 51 48 52 49 #endif /* _NF_NAT_L3PROTO_H */

+15 -15

include/net/netfilter/nf_nat_l4proto.h

reviewed

··· 42 42 }; 43 43 44 44 /* Protocol registration. */ 45 45 - extern int nf_nat_l4proto_register(u8 l3proto, const struct nf_nat_l4proto *l4proto); 46 46 - extern void nf_nat_l4proto_unregister(u8 l3proto, const struct nf_nat_l4proto *l4proto); 45 45 + int nf_nat_l4proto_register(u8 l3proto, const struct nf_nat_l4proto *l4proto); 46 46 + void nf_nat_l4proto_unregister(u8 l3proto, 47 47 + const struct nf_nat_l4proto *l4proto); 47 48 48 48 - extern const struct nf_nat_l4proto *__nf_nat_l4proto_find(u8 l3proto, u8 l4proto); 49 49 + const struct nf_nat_l4proto *__nf_nat_l4proto_find(u8 l3proto, u8 l4proto); 49 50 50 51 /* Built-in protocols. */ 51 52 extern const struct nf_nat_l4proto nf_nat_l4proto_tcp; ··· 55 54 extern const struct nf_nat_l4proto nf_nat_l4proto_icmpv6; 56 55 extern const struct nf_nat_l4proto nf_nat_l4proto_unknown; 57 56 58 58 - extern bool nf_nat_l4proto_in_range(const struct nf_conntrack_tuple *tuple, 59 59 - enum nf_nat_manip_type maniptype, 60 60 - const union nf_conntrack_man_proto *min, 61 61 - const union nf_conntrack_man_proto *max); 57 57 + bool nf_nat_l4proto_in_range(const struct nf_conntrack_tuple *tuple, 58 58 + enum nf_nat_manip_type maniptype, 59 59 + const union nf_conntrack_man_proto *min, 60 60 + const union nf_conntrack_man_proto *max); 62 61 63 63 - extern void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto, 64 64 - struct nf_conntrack_tuple *tuple, 65 65 - const struct nf_nat_range *range, 66 66 - enum nf_nat_manip_type maniptype, 67 67 - const struct nf_conn *ct, 68 68 - u16 *rover); 62 62 + void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto, 63 63 + struct nf_conntrack_tuple *tuple, 64 64 + const struct nf_nat_range *range, 65 65 + enum nf_nat_manip_type maniptype, 66 66 + const struct nf_conn *ct, u16 *rover); 69 67 70 70 - extern int nf_nat_l4proto_nlattr_to_range(struct nlattr *tb[], 71 71 - struct nf_nat_range *range); 68 68 + int nf_nat_l4proto_nlattr_to_range(struct nlattr *tb[], 69 69 + struct nf_nat_range *range); 72 70 73 71 #endif /*_NF_NAT_L4PROTO_H*/

+1 -1

include/net/netfilter/nf_queue.h

reviewed

··· 28 28 29 29 void nf_register_queue_handler(const struct nf_queue_handler *qh); 30 30 void nf_unregister_queue_handler(void); 31 31 - extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict); 31 31 + void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict); 32 32 33 33 bool nf_queue_entry_get_refs(struct nf_queue_entry *entry); 34 34 void nf_queue_entry_release_refs(struct nf_queue_entry *entry);

+2 -2

include/net/netfilter/xt_rateest.h

reviewed

··· 16 16 struct rcu_head rcu; 17 17 }; 18 18 19 19 - extern struct xt_rateest *xt_rateest_lookup(const char *name); 20 20 - extern void xt_rateest_put(struct xt_rateest *est); 19 19 + struct xt_rateest *xt_rateest_lookup(const char *name); 20 20 + void xt_rateest_put(struct xt_rateest *est); 21 21 22 22 #endif /* _XT_RATEEST_H */