From patchwork Tue Apr 14 01:51:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 25917 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 4F467DE09D for ; Tue, 14 Apr 2009 11:50:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752624AbZDNBun (ORCPT ); Mon, 13 Apr 2009 21:50:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753197AbZDNBum (ORCPT ); Mon, 13 Apr 2009 21:50:42 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:60332 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752439AbZDNBul (ORCPT ); Mon, 13 Apr 2009 21:50:41 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 692F317013C; Tue, 14 Apr 2009 10:39:35 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n3E1oYlR019924; Tue, 14 Apr 2009 09:50:34 +0800 Received: from localhost.localdomain (unknown [10.167.141.200]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 98531D4016; Tue, 14 Apr 2009 09:56:22 +0800 (CST) Message-ID: <49E3EC04.5000105@cn.fujitsu.com> Date: Tue, 14 Apr 2009 09:51:00 +0800 From: Yang Hongyang User-Agent: Thunderbird 2.0.0.17 (X11/20081009) MIME-Version: 1.0 To: "netdev@vger.kernel.org" , David Miller Subject: [PATCH]ipv6:remove useless check Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After switch (rthdr->type) {...},the check below is completely useless.Because: if the type is 2,then hdrlen must be 2 and segments_left must be 1,clearly the check is redundant;if the type is not 2,then goto sticky_done,the check is useless too. Signed-off-by: Yang Hongyang Reviewed-by: Shan Wei --- net/ipv6/ipv6_sockglue.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index d31df0f..a7fdf9a 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/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;