[PATCH 2.4] cosmetic update to ip6t_ipv6header

[PATCH 2.4] cosmetic update to ip6t_ipv6header

[Harald Welte]

[-- Attachment #1.1: Type: text/plain, Size: 558 bytes --]

Hi Davem!

Please apply the following patch to your 2.6 tree, thanks.


Author: Maciej Soltysiak
Status: Trivial

This patch removes unused destroy callback in ip6t_ipv6header.c
-- 
- Harald Welte <laforge@netfilter.org>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #1.2: 66_ipv6header.patch --]
[-- Type: text/plain, Size: 621 bytes --]

diff -u linux.orig/net/ipv6/netfilter/ip6t_ipv6header.c linux/net/ipv6/netfilter/ip6t_ipv6header.c
--- linux.orig/net/ipv6/netfilter/ip6t_ipv6header.c	2003-07-27 19:12:09.000000000 +0200
+++ linux/net/ipv6/netfilter/ip6t_ipv6header.c	2003-09-02 00:19:01.295173544 +0200
@@ -129,20 +129,13 @@
 	return 1;
 }
 
-static void
-ipv6header_destroy(void *matchinfo,
-		   unsigned int matchinfosize)
-{
-	return;
-}
-
 static struct ip6t_match
 ip6t_ipv6header_match = {
 	{ NULL, NULL },
 	"ipv6header",
 	&ipv6header_match,
 	&ipv6header_checkentry,
-	&ipv6header_destroy,
+	NULL,
 	THIS_MODULE
 };
 

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2.4] cosmetic update to ip6t_ipv6header

[David S. Miller]

On Thu, 2 Oct 2003 18:24:56 +0200
Harald Welte <laforge@netfilter.org> wrote:

> Please apply the following patch to your 2.6 tree, thanks.

Mass confusion... the subject says 2.4, here you're saying
2.6..

Because you sent me the 2.6.x variant of this patch already I
tried to put it into 2.4.x but that got rejects.

[PATCH 2.4 correct] cosmetic update to ip6t_ipv6header

[Martin Josefsson]

[-- Attachment #1.1: Type: text/plain, Size: 596 bytes --]

On Fri, 2003-10-03 at 08:36, David S. Miller wrote:
> On Thu, 2 Oct 2003 18:24:56 +0200
> Harald Welte <laforge@netfilter.org> wrote:
> 
> > Please apply the following patch to your 2.6 tree, thanks.
> 
> Mass confusion... the subject says 2.4, here you're saying
> 2.6..
> 
> Because you sent me the 2.6.x variant of this patch already I
> tried to put it into 2.4.x but that got rejects.

Here's the correct 2.4 version.
Found to be missing when syncing patch-o-matic.

Author: Maciej Soltysiak

This patch removes unused destroy callback in ip6t_ipv6header.c

-- 
/Martin

[-- Attachment #1.2: 85_ipv6header.patch --]
[-- Type: text/x-patch, Size: 621 bytes --]

diff -u linux.orig/net/ipv6/netfilter/ip6t_ipv6header.c linux/net/ipv6/netfilter/ip6t_ipv6header.c
--- linux.orig/net/ipv6/netfilter/ip6t_ipv6header.c	2003-07-27 19:12:09.000000000 +0200
+++ linux/net/ipv6/netfilter/ip6t_ipv6header.c	2003-09-02 00:19:01.295173544 +0200
@@ -129,20 +129,13 @@
 	return 1;
 }
 
-static void
-ipv6header_destroy(void *matchinfo,
-		   unsigned int matchinfosize)
-{
-	return;
-}
-
 static struct ip6t_match
 ip6t_ipv6header_match = {
 	{ NULL, NULL },
 	"ipv6header",
 	&ipv6header_match,
 	&ipv6header_checkentry,
-	&ipv6header_destroy,
+	NULL,
 	THIS_MODULE
 };
 

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2.4 correct] cosmetic update to ip6t_ipv6header

[David S. Miller]

On Mon, 13 Oct 2003 20:20:52 +0200
Martin Josefsson <gandalf@netfilter.org> wrote:

> Here's the correct 2.4 version.
> Found to be missing when syncing patch-o-matic.
> 
> Author: Maciej Soltysiak
> 
> This patch removes unused destroy callback in ip6t_ipv6header.c

Applied, thanks.