[2.6 patch] make nf_ct_ipv6_skip_exthdr() static

STALE6960d

3 messages, 3 authors, 2007-07-31 · open the first message on its own page

[2.6 patch] make nf_ct_ipv6_skip_exthdr() static

From: Adrian Bunk <hidden>
Date: 2007-07-29 15:07:48

nf_ct_ipv6_skip_exthdr() can now become static.

Signed-off-by: Adrian Bunk <redacted>

---

 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;
 

Re: [2.6 patch] make nf_ct_ipv6_skip_exthdr() static

From: Patrick McHardy <hidden>
Date: 2007-07-30 12:30:58

Adrian Bunk wrote:
nf_ct_ipv6_skip_exthdr() can now become static.

Applied, thanks.

Re: [2.6 patch] make nf_ct_ipv6_skip_exthdr() static

From: David Miller <davem@davemloft.net>
Date: 2007-07-31 01:05:29

From: Adrian Bunk <redacted>
Date: Sun, 29 Jul 2007 16:58:46 +0200
nf_ct_ipv6_skip_exthdr() can now become static.

Signed-off-by: Adrian Bunk <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help