patch-2.1.99 linux/net/ipv6/ip6_fib.c

• Lines: 34
• Date: Tue Apr 28 11:10:11 1998
• Orig file: v2.1.98/linux/net/ipv6/ip6_fib.c
• Orig date: Thu Mar 26 15:57:13 1998

diff -u --recursive --new-file v2.1.98/linux/net/ipv6/ip6_fib.c linux/net/ipv6/ip6_fib.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *
- *	$Id: ip6_fib.c,v 1.12 1998/03/20 09:12:16 davem Exp $
+ *	$Id: ip6_fib.c,v 1.13 1998/04/28 06:22:03 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -694,8 +694,13 @@
 		/*
 		 *	We can't tidy a case of two children.
 		 */
-		 
-		if (children > 1 || (fn->fn_flags & RTN_RTINFO))
+		if (children > 1) {
+			if (fn->leaf == NULL)
+				goto split_repair;
+			break;
+		}
+
+		if (fn->fn_flags & RTN_RTINFO)
 			break;
 
 		/*
@@ -765,6 +770,8 @@
 stree_node:
 
 	rt6_release(fn->leaf);
+
+split_repair:
 	rt = fib6_find_prefix(fn);
 
 	if (rt == NULL)