netdev
[Top] [All Lists]

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

To: davem@xxxxxxxxxx
Subject: [PATCH] IPV6: typo, unrequired #undef and killing warning
From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx>
Date: Wed, 04 Jun 2003 15:02:18 +0900 (JST)
Cc: netdev@xxxxxxxxxxx, Ville Nuorvala <vnuorval@xxxxxxxxxx>
Organization: USAGI Project
Sender: netdev-bounce@xxxxxxxxxxx
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@xxxxxxxxxxxxxx>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA

<Prev in Thread] Current Thread [Next in Thread>