aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorMartin Josefsson <gandalf@wlug.westbo.se>2006-11-28 20:35:08 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:31:10 -0500
commitae5718fb3dd0a11a4c9a061bf86417d52d58a6b3 (patch)
tree18d070424f6d2d74ee785c24d8f90744d61d3978 /include/net
parent605dcad6c85226e6d43387917b329d65b95cef39 (diff)
[NETFILTER]: nf_conntrack: more sanity checks in protocol registration/unregistration
Add some more sanity checks when registering/unregistering l3/l4 protocols. Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack_l3proto.h2
-rw-r--r--include/net/netfilter/nf_conntrack_l4proto.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index ffe23a1e0b97..11b4b29bfab1 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -86,7 +86,7 @@ extern struct nf_conntrack_l3proto *nf_ct_l3protos[AF_MAX];
86 86
87/* Protocol registration. */ 87/* Protocol registration. */
88extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto); 88extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
89extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto); 89extern int nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);
90 90
91extern struct nf_conntrack_l3proto * 91extern struct nf_conntrack_l3proto *
92nf_ct_l3proto_find_get(u_int16_t l3proto); 92nf_ct_l3proto_find_get(u_int16_t l3proto);
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 0c6babd54396..5193e4857b1b 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -102,7 +102,7 @@ extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
102 102
103/* Protocol registration. */ 103/* Protocol registration. */
104extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto); 104extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
105extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto); 105extern int nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
106 106
107/* Generic netlink helpers */ 107/* Generic netlink helpers */
108extern int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb, 108extern int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb,