From 749c45bf86225ec6dddb6c1009478648c9f56994 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 30 Jul 2007 18:04:57 -0700 Subject: [PATCH] --- yaml --- r: 63415 b: refs/heads/master c: 1a3a206f7f2aa50545cc3d056405ad7bc3c9bca8 h: refs/heads/master i: 63413: 734ac6e32d51a16f448659e46b5f9036563e9139 63411: d82f59fde75333baf7d68cbc2312b413ee4e9a6b 63407: f01ab21735580e067547a12ad10611de525f596f v: v3 --- [refs] | 2 +- trunk/include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 3 --- trunk/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ce0edf0515d4..5b477c5d6b49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fea1ab0fcf117bc1e9c9285af6463d31d9cc0ac6 +refs/heads/master: 1a3a206f7f2aa50545cc3d056405ad7bc3c9bca8 diff --git a/trunk/include/net/netfilter/ipv6/nf_conntrack_ipv6.h b/trunk/include/net/netfilter/ipv6/nf_conntrack_ipv6.h index 5a8965904377..070d12cb4634 100644 --- a/trunk/include/net/netfilter/ipv6/nf_conntrack_ipv6.h +++ b/trunk/include/net/netfilter/ipv6/nf_conntrack_ipv6.h @@ -7,9 +7,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6; extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6; extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6; -extern int nf_ct_ipv6_skip_exthdr(const struct sk_buff *skb, int start, - u8 *nexthdrp, int len); - extern int nf_ct_frag6_init(void); extern void nf_ct_frag6_cleanup(void); extern struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb); diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/trunk/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index 36df2218b669..3153e15e0f7c 100644 --- a/trunk/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/trunk/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c @@ -86,8 +86,8 @@ static int ipv6_print_conntrack(struct seq_file *s, * - Note also special handling of AUTH header. Thanks to IPsec wizards. */ -int nf_ct_ipv6_skip_exthdr(const struct sk_buff *skb, int start, u8 *nexthdrp, - int len) +static int nf_ct_ipv6_skip_exthdr(const struct sk_buff *skb, int start, + u8 *nexthdrp, int len) { u8 nexthdr = *nexthdrp;