[PATCH] dead code elimination in ip6_queue.c

[PATCH] dead code elimination in ip6_queue.c

[Stephane Ouellette]

[-- Attachment #1: Type: text/plain, Size: 86 bytes --]

Folks,

   the following patch removes dead code in ip6_queue.c

Stephane Ouellette.


[-- Attachment #2: ip6_queue.c.patch --]
[-- Type: text/plain, Size: 443 bytes --]

--- linux-2.4.21-pre5-ac3/net/ipv6/netfilter/ip6_queue.c	Fri Mar 14 15:16:44 2003
+++ linux-2.4.21-pre5-ac3-fixed/net/ipv6/netfilter/ip6_queue.c	Sat Mar 15 12:58:50 2003
@@ -265,8 +265,6 @@
 	return skb;
 
 nlmsg_failure:
-	if (skb)
-		kfree_skb(skb);
 	*errp = -EINVAL;
 	printk(KERN_ERR "ip6_queue: error creating packet message\n");
 	return NULL;
@@ -730,7 +728,6 @@
 
 static int __init init(void)
 {
-	
 	return init_or_cleanup(1);
 }
 

Re: [PATCH] dead code elimination in ip6_queue.c

[James Morris]

On Sat, 15 Mar 2003, Stephane Ouellette wrote:

> Folks,
> 
>    the following patch removes dead code in ip6_queue.c
> 

Incorrect, see NLMSG_PUT().


- James
-- 
James Morris
<jmorris@intercode.com.au>

Re: [PATCH] dead code elimination in ip6_queue.c

[Stephane Ouellette]

James Morris wrote:

>On Sat, 15 Mar 2003, Stephane Ouellette wrote:
>
>  
>
>>Folks,
>>
>>   the following patch removes dead code in ip6_queue.c
>>
>>    
>>
>
>Incorrect, see NLMSG_PUT().
>
>
>- James
>  
>

James,

   I'm sorry.  I didn't check the macros...

   Thank you for pointing my mistake.

Stephane

Re: [PATCH] dead code elimination in ip6_queue.c

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

On Sat, Mar 15, 2003 at 01:01:05PM -0500, Stephane Ouellette wrote:
> Folks,
> 
>   the following patch removes dead code in ip6_queue.c

the same code is in ip_queue.c.  I've created a new patch for the
'pending' repository fixing both cases.

> Stephane Ouellette.
-- 
- 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 #2: Type: application/pgp-signature, Size: 232 bytes --]

Re: [PATCH] dead code elimination in ip6_queue.c

[Stephane Ouellette]

Harald,

     I have been notified by James Morris that my patch is incorrect 
because of a macro named NLMSG_PUT() which uses the code I have removed 
in my patch.  There is a goto statement inside this macro.

Regards,

Stephane Ouellette

Re: [PATCH] dead code elimination in ip6_queue.c

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 787 bytes --]

On Wed, Mar 26, 2003 at 02:38:31PM -0500, Stephane Ouellette wrote:
> Harald,
> 
>     I have been notified by James Morris that my patch is incorrect 
> because of a macro named NLMSG_PUT() which uses the code I have removed 
> in my patch.  There is a goto statement inside this macro.

Yes, I've read that mail a couple of minutes later.  Please ignore my
response.

> Regards,
> Stephane Ouellette

-- 
- 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 #2: Type: application/pgp-signature, Size: 232 bytes --]