From patchwork Wed Jan 10 09:07:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 10154605 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 3A848602D8 for ; Wed, 10 Jan 2018 09:07:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FAEA283D1 for ; Wed, 10 Jan 2018 09:07:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2415328419; Wed, 10 Jan 2018 09:07:50 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham 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 7D8B6283D1 for ; Wed, 10 Jan 2018 09:07:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752987AbeAJJHr (ORCPT ); Wed, 10 Jan 2018 04:07:47 -0500 Received: from mx2.suse.de ([195.135.220.15]:46855 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752403AbeAJJHq (ORCPT ); Wed, 10 Jan 2018 04:07:46 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D7AD9ACA7; Wed, 10 Jan 2018 09:07:44 +0000 (UTC) From: Hannes Reinecke To: Sagi Grimberg Cc: Doug Ledford , Jason Gunthorpe , linux-rdma@vger.kernel.org, Hannes Reinecke , Hannes Reinecke , Steve Schremmer Subject: [PATCH] iscsi_iser: Re-enable 'iser_pi_guard' module parameter Date: Wed, 10 Jan 2018 10:07:36 +0100 Message-Id: <1515575256-9949-1-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.6 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The module parameter 'iser_pi_guard' has been disabled by commit 5bb6e543d2a7d58 ("IB/iser: DIX update"), but the functionality to select the guard algorithm is still required. Fixes: 5bb6e543d2a7d58 ("IB/iser: DIX update") Signed-off-by: Hannes Reinecke Cc: Steve Schremmer --- drivers/infiniband/ulp/iser/iscsi_iser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 19624e0..34c4d0a 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c @@ -649,8 +649,10 @@ static void iscsi_iser_cleanup_task(struct iscsi_task *task) u32 sig_caps = ib_conn->device->ib_device->attrs.sig_prot_cap; scsi_host_set_prot(shost, iser_dif_prot_caps(sig_caps)); - scsi_host_set_guard(shost, SHOST_DIX_GUARD_IP | - SHOST_DIX_GUARD_CRC); + if (iser_pi_guard) + scsi_host_set_guard(shost, SHOST_DIX_GUARD_IP); + else + scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC); } if (iscsi_host_add(shost,