Merge mulgrave-w:git/linux-2.6

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.

1 files changed, 9 insertions, 1 deletions

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index a5eaaf693abf..4f3bb7fcc8b5 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -407,8 +407,16 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
                 /* routing header option needs extra check */
                 if (optname == IPV6_RTHDR && opt->srcrt) {
                         struct ipv6_rt_hdr *rthdr = opt->srcrt;
-                        if (rthdr->type)
+                        switch (rthdr->type) {
+                        case IPV6_SRCRT_TYPE_0:
+#ifdef CONFIG_IPV6_MIP6
+                        case IPV6_SRCRT_TYPE_2:
+#endif
+                                break;
+                        default:
                                 goto sticky_done;
+                        }
+
                         if ((rthdr->hdrlen & 1) ||
                             (rthdr->hdrlen >> 1) != rthdr->segments_left)
                                 goto sticky_done;