From 41ee4b6bb914dd77c10ebe179f13b92d8ab40754 Mon Sep 17 00:00:00 2001
From: Yang Hongyang <yanghy@cn.fujitsu.com>
Date: Mon, 13 Apr 2009 15:51:00 +0000
Subject: [PATCH] --- yaml --- r: 143452 b: refs/heads/master c:
 ce8632ba6b3ed0bf2efa98672e2808de34250389 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv6/ipv6_sockglue.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9e70481422df..ff449fa0164d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eca93bcf73e5939053a94f7c48f8d6fe6199e00
+refs/heads/master: ce8632ba6b3ed0bf2efa98672e2808de34250389
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
index d31df0f4bc9a..a7fdf9a27f15 100644
--- a/trunk/net/ipv6/ipv6_sockglue.c
+++ b/trunk/net/ipv6/ipv6_sockglue.c
@@ -380,10 +380,6 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 			default:
 				goto sticky_done;
 			}
-
-			if ((rthdr->hdrlen & 1) ||
-			    (rthdr->hdrlen >> 1) != rthdr->segments_left)
-				goto sticky_done;
 		}
 
 		retv = 0;