projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: nf_conntrack_expect: function naming unification
[deliverable/linux.git]
/
include
/
net
/
netfilter
/
nf_conntrack_core.h
diff --git
a/include/net/netfilter/nf_conntrack_core.h
b/include/net/netfilter/nf_conntrack_core.h
index 7fdc72c01356cf69a6d6b3a907838c47ccc2bb4e..a18f79c80db8ef4fe3ff4182b550189e0e5267cf 100644
(file)
--- a/
include/net/netfilter/nf_conntrack_core.h
+++ b/
include/net/netfilter/nf_conntrack_core.h
@@
-27,6
+27,12
@@
extern unsigned int nf_conntrack_in(int pf,
extern int nf_conntrack_init(void);
extern void nf_conntrack_cleanup(void);
extern int nf_conntrack_init(void);
extern void nf_conntrack_cleanup(void);
+extern int nf_conntrack_proto_init(void);
+extern void nf_conntrack_proto_fini(void);
+
+extern int nf_conntrack_helper_init(void);
+extern void nf_conntrack_helper_fini(void);
+
struct nf_conntrack_l3proto;
extern struct nf_conntrack_l3proto *nf_ct_find_l3proto(u_int16_t pf);
/* Like above, but you already have conntrack read lock. */
struct nf_conntrack_l3proto;
extern struct nf_conntrack_l3proto *nf_ct_find_l3proto(u_int16_t pf);
/* Like above, but you already have conntrack read lock. */
@@
-52,8
+58,7
@@
nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,
/* Find a connection corresponding to a tuple. */
extern struct nf_conntrack_tuple_hash *
/* Find a connection corresponding to a tuple. */
extern struct nf_conntrack_tuple_hash *
-nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple,
- const struct nf_conn *ignored_conntrack);
+nf_conntrack_find_get(const struct nf_conntrack_tuple *tuple);
extern int __nf_conntrack_confirm(struct sk_buff **pskb);
extern int __nf_conntrack_confirm(struct sk_buff **pskb);
@@
-64,7
+69,7
@@
static inline int nf_conntrack_confirm(struct sk_buff **pskb)
int ret = NF_ACCEPT;
if (ct) {
int ret = NF_ACCEPT;
if (ct) {
- if (!nf_ct_is_confirmed(ct))
+ if (!nf_ct_is_confirmed(ct)
&& !nf_ct_is_dying(ct)
)
ret = __nf_conntrack_confirm(pskb);
nf_ct_deliver_cached_events(ct);
}
ret = __nf_conntrack_confirm(pskb);
nf_ct_deliver_cached_events(ct);
}
@@
-78,9
+83,9
@@
print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,
struct nf_conntrack_l3proto *l3proto,
struct nf_conntrack_l4proto *proto);
struct nf_conntrack_l3proto *l3proto,
struct nf_conntrack_l4proto *proto);
-extern struct list_head *nf_conntrack_hash;
-extern struct list_head nf_c
onntrack
_expect_list;
+extern struct
h
list_head *nf_conntrack_hash;
+extern struct list_head nf_c
t
_expect_list;
extern rwlock_t nf_conntrack_lock ;
extern rwlock_t nf_conntrack_lock ;
-extern struct list_head unconfirmed;
+extern struct
h
list_head unconfirmed;
#endif /* _NF_CONNTRACK_CORE_H */
#endif /* _NF_CONNTRACK_CORE_H */
This page took
0.037643 seconds
and
5
git commands to generate.