Linux 2.6.21.1

IPV6: Fix for RT0 header ipv6 change.
[IPV6]: Fix thinko in ipv6_rthdr_rcv() changes. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2007-04-27 14:49:26 -07:00 · 2007-04-27 14:48:16 -07:00 · 2007-04-27 14:48:16 -07:00
3 changed files with 6 additions and 1 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 21
-EXTRAVERSION =
+EXTRAVERSION = .1
 NAME = Nocturnal Monster Puppy

 # *DOCUMENTATION*
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@ -777,6 +777,10 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 							    .tos = frn->fl_tos,
 							    .scope = frn->fl_scope } } };

+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	res.r = NULL;
+#endif
+
 	frn->err = -ENOENT;
 	if (tb) {
 		local_bh_disable();
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@ -396,6 +396,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp)

 	switch (hdr->type) {
 #ifdef CONFIG_IPV6_MIP6
+	case IPV6_SRCRT_TYPE_2:
 		break;
 #endif
 	case IPV6_SRCRT_TYPE_0: