From patchwork Mon Mar 20 10:00:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 740912 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vmsDJ53sRz9s0Z for ; Mon, 20 Mar 2017 21:11:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HdxWkPOX"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753883AbdCTKL1 (ORCPT ); Mon, 20 Mar 2017 06:11:27 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35400 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754050AbdCTKJl (ORCPT ); Mon, 20 Mar 2017 06:09:41 -0400 Received: by mail-pg0-f65.google.com with SMTP id g2so19069282pge.2 for ; Mon, 20 Mar 2017 03:09:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=upkjxLIScT6orpJ9oG2DJL6niSJnm5wMqirg06GYcCY=; b=HdxWkPOXC4SfCvaCVYEy6+d40YUK39ka6pt2/duo+YnURrbmGGZ+Z2th2yeH12OY6T zDCu/RM52MQsOcLBuSJJ4rTB3cGNgH+9kWoo9ZJ2iBGlbc9/iI6DSqQYPbGs1EW5JguH 9uuPvi+yOlnbyiOCdf6qqrDlFMhRkb0rz6B+X+aTGDjD5fo+s+chQU8OkcpuAq48U5oE cQkHlaN85xyyD5xYhWJ/bqwhTav2slq2N1dTLI/Asa3BoOOAxoSLps93Vzma1ZcIVe4/ o8NjuyZyR6vY9roP/1lQHeoaLUrBU+a6BeJqJKmMMh+J1PFLVpVuhGaR9l8PSmVfmvHJ SSsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=upkjxLIScT6orpJ9oG2DJL6niSJnm5wMqirg06GYcCY=; b=iXUsHh8jSVpGD/Jh4iDPWPVUvhSmGbc4O1f/JJlyfoYrjQYgKLxmiuiV7ODI+wmykA JfGyAdUKl07lUxsnks6Z7Fx40XmmIh9t4i7fuUBiCKLuviPrNpqVa+QqFohUCE9ogQPT 9N5jM8KK78eKb5OBsnXftXK33WthjtVB3LmbvGGKlH/81+K6ZrMDSsMJmzrnxcsy8CRr r4TonueOzCvKxbkaq57g5HiP4UdlLc6e5z2G/JcQo8UrgbaBeF5eZFTKLqxFIS8NzXAi Cvh+Q5qyY4esMILF5BmuzhkrLGxXVC8QvK4Jf7xk0VTjLcDdEHRT1Cjbax8wUk4y/2ua Hlxw== X-Gm-Message-State: AFeK/H2UurCyz/7XREKM3K4Vqm6rYNCT7K5l89XvWj3mzdh9Bico9YOoYLFVN8OqKg9VtQ== X-Received: by 10.84.139.67 with SMTP id 61mr38768557plq.61.1490004040562; Mon, 20 Mar 2017 03:00:40 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id v143sm32303898pgb.47.2017.03.20.03.00.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 03:00:40 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net] sctp: remove useless err from sctp_association_init Date: Mon, 20 Mar 2017 18:00:28 +0800 Message-Id: <82209fcc4742baa1c4855af7e54b88177e9d0537.1490004028.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch is to remove the unnecessary temporary variable 'err' from sctp_association_init. Signed-off-by: Xin Long Acked-by: Neil Horman --- net/sctp/associola.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 2a6835b..0439a1a 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -71,9 +71,8 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a { struct net *net = sock_net(sk); struct sctp_sock *sp; - int i; sctp_paramhdr_t *p; - int err; + int i; /* Retrieve the SCTP per socket area. */ sp = sctp_sk((struct sock *)sk); @@ -264,8 +263,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a /* AUTH related initializations */ INIT_LIST_HEAD(&asoc->endpoint_shared_keys); - err = sctp_auth_asoc_copy_shkeys(ep, asoc, gfp); - if (err) + if (sctp_auth_asoc_copy_shkeys(ep, asoc, gfp)) goto fail_init; asoc->active_key_id = ep->active_key_id;