[PATCH] IPV6: typo, unrequired #undef and killing warning

[PATCH] IPV6: typo, unrequired #undef and killing warning

[YOSHIFUJI Hideaki / 吉藤英明]

Hello.

- no need to #undef CONFIG_IPV6_SUBTREE
- use braces around "&" and "|".
- fib_repair_tree() is typo.

Thanks.

Index: linux25-LINUS/net/ipv6/ip6_fib.c
===================================================================
RCS file: /cvsroot/usagi/usagi-backport/linux25/net/ipv6/ip6_fib.c,v
retrieving revision 1.1.1.12
diff -u -r1.1.1.12 ip6_fib.c
--- linux25-LINUS/net/ipv6/ip6_fib.c	26 May 2003 08:04:11 -0000	1.1.1.12
+++ linux25-LINUS/net/ipv6/ip6_fib.c	4 Jun 2003 05:39:49 -0000
@@ -40,7 +40,6 @@
 #include <net/ip6_route.h>
 
 #define RT6_DEBUG 2
-#undef CONFIG_IPV6_SUBTREES
 
 #if RT6_DEBUG >= 3
 #define RT6_TRACE(x...) printk(KERN_DEBUG x)
@@ -594,8 +593,8 @@
 	   is orphan. If it is, shoot it.
 	 */
 st_failure:
-	if (fn && !(fn->fn_flags&RTN_RTINFO|RTN_ROOT))
-		fib_repair_tree(fn);
+	if (fn && !(fn->fn_flags&(RTN_RTINFO|RTN_ROOT)))
+		fib6_repair_tree(fn);
 	dst_free(&rt->u.dst);
 	return err;
 #endif

-- 
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@linux-ipv6.org>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA

Re: [PATCH] IPV6: typo, unrequired #undef and killing warning

[Christoph Hellwig]

On Wed, Jun 04, 2003 at 03:02:18PM +0900, YOSHIFUJI Hideaki / ?$B5HF#1QL@?(B wrote:
>  st_failure:
> -	if (fn && !(fn->fn_flags&RTN_RTINFO|RTN_ROOT))
> -		fib_repair_tree(fn);
> +	if (fn && !(fn->fn_flags&(RTN_RTINFO|RTN_ROOT)))

This still is not the right codingstyle :) it should be

	if (fn && !(fn->fn_flags & (RTN_RTINFO|RTN_ROOT)))

Re: [PATCH] IPV6: typo, unrequired #undef and killing warning

[David S. Miller]

   From: Christoph Hellwig <hch@infradead.org>
   Date: Wed, 4 Jun 2003 07:08:01 +0100

   This still is not the right codingstyle :) it should be
   
   	if (fn && !(fn->fn_flags & (RTN_RTINFO|RTN_ROOT)))
   
I'll take care of this, Yoshfuji you do not need to
make a new patch :)

Re: [PATCH] IPV6: typo, unrequired #undef and killing warning

[David S. Miller]

   From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
   Date: Wed, 04 Jun 2003 15:02:18 +0900 (JST)

   - use braces around "&" and "|".

You mean "parentheses", braces define basic block scope in the
C language, parentheses group expressions :-)

Patch applied, thank you :-)

   

Re: [PATCH] IPV6: typo, unrequired #undef and killing warning

[YOSHIFUJI Hideaki / 吉藤英明]

In article <20030604.004738.26506541.davem@redhat.com> (at Wed, 04 Jun 2003 00:47:38 -0700 (PDT)), "David S. Miller" <davem@redhat.com> says:

> You mean "parentheses", braces define basic block scope in the
> C language, parentheses group expressions :-)

I'm deeply ashamed...

-- 
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@linux-ipv6.org>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA