* [2.6 patch] make nf_ct_ipv6_skip_exthdr() static
@ 2007-07-29 14:58 Adrian Bunk
2007-07-30 12:30 ` Patrick McHardy
2007-07-31 1:05 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Adrian Bunk @ 2007-07-29 14:58 UTC (permalink / raw)
To: Yasuyuki Kozakai, Patrick McHardy; +Cc: netdev, netfilter-devel, linux-kernel
nf_ct_ipv6_skip_exthdr() can now become static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/net/netfilter/ipv6/nf_conntrack_ipv6.h | 3 ---
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
--- linux-2.6.23-rc1-mm1/include/net/netfilter/ipv6/nf_conntrack_ipv6.h.old 2007-07-26 20:17:47.000000000 +0200
+++ linux-2.6.23-rc1-mm1/include/net/netfilter/ipv6/nf_conntrack_ipv6.h 2007-07-26 20:17:53.000000000 +0200
@@ -7,9 +7,6 @@
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);
--- linux-2.6.23-rc1-mm1/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c.old 2007-07-26 20:18:03.000000000 +0200
+++ linux-2.6.23-rc1-mm1/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c 2007-07-26 20:18:27.000000000 +0200
@@ -86,8 +86,8 @@
* - 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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [2.6 patch] make nf_ct_ipv6_skip_exthdr() static
2007-07-29 14:58 [2.6 patch] make nf_ct_ipv6_skip_exthdr() static Adrian Bunk
@ 2007-07-30 12:30 ` Patrick McHardy
2007-07-31 1:05 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2007-07-30 12:30 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Yasuyuki Kozakai, netfilter-devel, netdev, linux-kernel
Adrian Bunk wrote:
> nf_ct_ipv6_skip_exthdr() can now become static.
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [2.6 patch] make nf_ct_ipv6_skip_exthdr() static
2007-07-29 14:58 [2.6 patch] make nf_ct_ipv6_skip_exthdr() static Adrian Bunk
2007-07-30 12:30 ` Patrick McHardy
@ 2007-07-31 1:05 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2007-07-31 1:05 UTC (permalink / raw)
To: bunk; +Cc: yasuyuki.kozakai, kaber, netfilter-devel, netdev, linux-kernel
From: Adrian Bunk <bunk@stusta.de>
Date: Sun, 29 Jul 2007 16:58:46 +0200
> nf_ct_ipv6_skip_exthdr() can now become static.
>
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-31 1:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-29 14:58 [2.6 patch] make nf_ct_ipv6_skip_exthdr() static Adrian Bunk
2007-07-30 12:30 ` Patrick McHardy
2007-07-31 1:05 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).