From patchwork Mon Mar 2 19:46:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Yasevich X-Patchwork-Id: 23965 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 1D71EDDEE7 for ; Tue, 3 Mar 2009 06:46:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754343AbZCBTq1 (ORCPT ); Mon, 2 Mar 2009 14:46:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754188AbZCBTqZ (ORCPT ); Mon, 2 Mar 2009 14:46:25 -0500 Received: from g1t0029.austin.hp.com ([15.216.28.36]:16198 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754058AbZCBTqW (ORCPT ); Mon, 2 Mar 2009 14:46:22 -0500 Received: from smtp2.fc.hp.com (smtp2.fc.hp.com [15.11.136.114]) by g1t0029.austin.hp.com (Postfix) with ESMTP id F1751384CE; Mon, 2 Mar 2009 19:46:20 +0000 (UTC) Received: from localhost.localdomain (squirrel.fc.hp.com [15.11.146.57]) by smtp2.fc.hp.com (Postfix) with ESMTP id 8A6392B5B5C; Mon, 2 Mar 2009 19:24:07 +0000 (UTC) From: Vlad Yasevich To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-sctp@vger.kernel.org, Wei Yongjun , Vlad Yasevich Subject: [PATCH net-next 2/5] sctp: remove dup code in net/sctp/socket.c Date: Mon, 2 Mar 2009 14:46:11 -0500 Message-Id: <1236023174-18314-3-git-send-email-vladislav.yasevich@hp.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1236023174-18314-2-git-send-email-vladislav.yasevich@hp.com> References: <> <1236023174-18314-1-git-send-email-vladislav.yasevich@hp.com> <1236023174-18314-2-git-send-email-vladislav.yasevich@hp.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun Remove dup check of "if (optlen < sizeof(int))". Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich --- net/sctp/socket.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index dea864f..4bc558c 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3069,9 +3069,6 @@ static int sctp_setsockopt_maxburst(struct sock *sk, int val; int assoc_id = 0; - if (optlen < sizeof(int)) - return -EINVAL; - if (optlen == sizeof(int)) { printk(KERN_WARNING "SCTP: Use of int in max_burst socket option deprecated\n"); @@ -5283,9 +5280,6 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len, struct sctp_sock *sp; struct sctp_association *asoc; - if (len < sizeof(int)) - return -EINVAL; - if (len == sizeof(int)) { printk(KERN_WARNING "SCTP: Use of int in max_burst socket option deprecated\n");