From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36745C5DF60 for ; Fri, 8 Nov 2019 19:09:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05F8820673 for ; Fri, 8 Nov 2019 19:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240158; bh=fFmKlk09ajJ78pWQurmV9l9LYHsomVaDHUaR7UfZzGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jhDMPSMc1dVCDBw+ia/e0hh/sdqVuzNkia0B4uCCTlDeqyHGg2+e5OHhDjElgE0I/ 85OBh3cbWIi2miSnMycGb2npuRpKDpyn2B5nQEC+Uxai577NC8D+h0gfjW1CDqQg1P az/i709IZbcncc/chM8nAIGA8Idu7YuP9qyYcavs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403794AbfKHTJR (ORCPT ); Fri, 8 Nov 2019 14:09:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:40774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391265AbfKHTJO (ORCPT ); Fri, 8 Nov 2019 14:09:14 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 758BE20673; Fri, 8 Nov 2019 19:09:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240154; bh=fFmKlk09ajJ78pWQurmV9l9LYHsomVaDHUaR7UfZzGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l8sic+Eq9qsyJG0bxCfNQbRCTlLfUFA0UhvHt4Q3dVTPLyIzyfIh0ODqbbn4xB9Rk p8iGLcH44Amdoq/tVCCs//VSB/kh8KGHOYKkryAy2NIm5EUDl5jktCwXMeoIdtxYwh jlKL/rv+qqrEtU3Qu6gE6hYprNo1iJZPuGjSR1p4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ursula Braun , Karsten Graul , "David S. Miller" Subject: [PATCH 5.3 106/140] net/smc: keep vlan_id for SMC-R in smc_listen_work() Date: Fri, 8 Nov 2019 19:50:34 +0100 Message-Id: <20191108174911.596119360@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174900.189064908@linuxfoundation.org> References: <20191108174900.189064908@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ursula Braun [ Upstream commit ca5f8d2dd5229ccacdd5cfde1ce4d32b0810e454 ] Creating of an SMC-R connection with vlan-id fails, because smc_listen_work() determines the vlan_id of the connection, saves it in struct smc_init_info ini, but clears the ini area again if SMC-D is not applicable. This patch just resets the ISM device before investigating SMC-R availability. Fixes: bc36d2fc93eb ("net/smc: consolidate function parameters") Signed-off-by: Ursula Braun Signed-off-by: Karsten Graul Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/smc/af_smc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1298,8 +1298,8 @@ static void smc_listen_work(struct work_ /* check if RDMA is available */ if (!ism_supported) { /* SMC_TYPE_R or SMC_TYPE_B */ /* prepare RDMA check */ - memset(&ini, 0, sizeof(ini)); ini.is_smcd = false; + ini.ism_dev = NULL; ini.ib_lcl = &pclc->lcl; rc = smc_find_rdma_device(new_smc, &ini); if (rc) {