Linux 2.6.21.1

Linux 2.6.21.1

[Greg KH]

We (the -stable team) are announcing the release of the 2.6.21.1 kernel.
This release has two bugfixes for networking issues that should cause
all users of ipv4 or ipv6 to upgrade to this version.

I'll also be replying to this message with a copy of the patch between
2.6.21 and 2.6.21.1

The updated 2.6.21.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.21.y.git
and can be browsed at the normal kernel.org git web browser:
        www.kernel.org/git/

thanks,

greg k-h

--------
 Makefile                |    2 +-
 net/ipv4/fib_frontend.c |    4 ++++
 net/ipv6/exthdrs.c      |    1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

Summary of changes from v2.6.21 to v2.6.21.1
============================================

Greg Kroah-Hartman (1):
      Linux 2.6.21.1

Sergey Vlasov (1):
      IPV4: Fix OOPS'er added to netlink fib.

YOSHIFUJI Hideaki (1):
      IPV6: Fix for RT0 header ipv6 change.

Re: Linux 2.6.21.1

[Greg KH]

diff --git a/Makefile b/Makefile
index d970cb1..58c08d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 21
-EXTRAVERSION =
+EXTRAVERSION = .1
 NAME = Nocturnal Monster Puppy
 
 # *DOCUMENTATION*
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index cac06c4..444a56b 100644
--- 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();
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index fb39604..3205ec9 100644
--- 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: