From patchwork Wed Sep 20 23:27:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E614E60208 for ; Wed, 20 Sep 2017 23:41:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8F2829267 for ; Wed, 20 Sep 2017 23:41:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDFB92926F; Wed, 20 Sep 2017 23:41:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7014829267 for ; Wed, 20 Sep 2017 23:41:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751853AbdITXhv (ORCPT ); Wed, 20 Sep 2017 19:37:51 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:44237 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751769AbdITXht (ORCPT ); Wed, 20 Sep 2017 19:37:49 -0400 Received: by mail-pg0-f46.google.com with SMTP id j16so2551655pga.1 for ; Wed, 20 Sep 2017 16:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kCM+vcxnWu+b3qMS63jdc0XvvBsJirBIYmw5PqFbzTg=; b=LYZzX9peAW8dEijja+LYOq/lWrj5g7IVLQqNUa2ct69Rqw55U8QaZXRvUv4j2DKedL yhjSaTPOq2JVF18VYRtavX/E7yMOwFe+TbYj3McmAmfer2q88N8MXoGDLB8JalU2XSJi ladW5T4a5zpRDEhOhV1IvrVvIAmp7xln7RWhY= 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:in-reply-to :references; bh=kCM+vcxnWu+b3qMS63jdc0XvvBsJirBIYmw5PqFbzTg=; b=XFkYqURSB+TRDfziIB2mcvhsOtVHZJoVWs9W/iEiu36MhC+2uvRIsaYaoFVtAYKASV 7CoIw+WhXeP21FKEOtHEnqp216Qg/BDPv+T/DjgY3fpQ3ciY818St7b2lTBz7Jl4ZwJe qZPvWqR0LMzC5P5YwmhcgnTpGEj9C9l+nfI7y+y06TLFpqEzk2dJJkhwiHwHujPVBDNB gbzCtt7/JDq2hvQL7Y7fjPvShRspz7dwK4dh6qwOmM0FE1+bomOZymdeoDRwsSo7kGJD arKi35fOfbF6ouzwcM2C7TG0qMgKTwTblP5qmQ3Uhn2efyn7Qo+9xtRoyMPt4T71FFdM hxGw== X-Gm-Message-State: AHPjjUi49UFVsYIvqktZS7NCO3HikTz4iOAyhsVkneRr+UloKnPfxa5Z B8FDRLSi7bLxkXSdK5nVyHgtJA== X-Google-Smtp-Source: AOwi7QAGgBOswvJw0XN7L6wlljgAQwfISFvmnsCVJwRTv81dpIN7u3QJXDtD86FQ4H+8SSmGcwC3TQ== X-Received: by 10.99.119.133 with SMTP id s127mr3872446pgc.271.1505950669501; Wed, 20 Sep 2017 16:37:49 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id p12sm95966pgd.0.2017.09.20.16.37.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 16:37:47 -0700 (PDT) From: Kees Cook To: Thomas Gleixner Cc: Kees Cook , QLogic-Storage-Upstream@qlogic.com, "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 29/31] scsi/bnx2i: Initialize timer Date: Wed, 20 Sep 2017 16:27:53 -0700 Message-Id: <1505950075-50223-30-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505950075-50223-1-git-send-email-keescook@chromium.org> References: <1505950075-50223-1-git-send-email-keescook@chromium.org> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There was a seemingly missing call to setup_timer() in one handler, so add setup_timer() here to remove the open-coded initialization. Cc: QLogic-Storage-Upstream@qlogic.com Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org Signed-off-by: Kees Cook --- drivers/scsi/bnx2i/bnx2i_iscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index bffc7e91b7e5..337139dadad0 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c @@ -1611,9 +1611,9 @@ static int bnx2i_conn_start(struct iscsi_cls_conn *cls_conn) * this should normally not sleep for a long time so it should * not disrupt the caller. */ + setup_timer(&bnx2i_conn->ep->ofld_timer, bnx2i_ep_ofld_timer, + (unsigned long) bnx2i_conn->ep); bnx2i_conn->ep->ofld_timer.expires = 1 * HZ + jiffies; - bnx2i_conn->ep->ofld_timer.function = bnx2i_ep_ofld_timer; - bnx2i_conn->ep->ofld_timer.data = (unsigned long) bnx2i_conn->ep; add_timer(&bnx2i_conn->ep->ofld_timer); /* update iSCSI context for this conn, wait for CNIC to complete */ wait_event_interruptible(bnx2i_conn->ep->ofld_wait,