Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1785191pxp; Mon, 7 Mar 2022 02:15:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIts0c3TyED/eu/yStQ6u5wCDbvaMRau5kfXQ2+9wJv++KNjNYwtRmjQtLyctRieekqrgN X-Received: by 2002:a17:906:2486:b0:6cf:ced9:e4cc with SMTP id e6-20020a170906248600b006cfced9e4ccmr8641816ejb.201.1646648132628; Mon, 07 Mar 2022 02:15:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646648132; cv=none; d=google.com; s=arc-20160816; b=kn12uwzwz+fb4LXSCo7mNNae9M1LFvzt4y0p93ROzgLkdrM/OrXQRjzuIA+Z3xPCoM UCxuch0XsMtiD2W+n/K9hZDYQI1kyQ1zPzl6OJpj/1sr1nPzix9y9D/nwFwI5/lnA9R9 1DO9z+umd7wVmKmXXcYTZUd5uhrluIcQFt3h9ZXI+IMcevP2/XHLBMzRD2AR8mFau/s1 abZl7zwfp1Y/4kt+XO1oABJCr2iLIB3vJTYxyTsBP+qYyU9WlCGQjGNxvTcuuZlOTpc5 RewC6n/4GyyxXHz9JOGMFB81ND2tpXaXp4TfhkpjrY9+QwfxtVKBK83DamWv/zqrscEh oq7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TDiUu1kBzU4KzcN9IS/mVRa0iexCAGs++6Y+OigMOjQ=; b=eStBngOHjxYR477AB51I8r/gnB2eX9mXQr+FgBibLXBxIma2a6fRixa2HPJDNB67Sq XDE7KKrUtrhJ48bHomzPMgxJRoxjpIlUli9sPTrCrBDXTcFmZHxxKu57sFNjynvg/efn tXvFfaLZ803POiguAhVimg/RsTo3OZkJdHD4h9yBNSM8JvUxjn0CFkllGEgXZP7NSFOT aaEK0mt3E+rsXfDtx5Ka16e28jaxOKk9KnjQRjR6LRqRya7YKOw77uSXAvKsodQYVtSg NSJlLku9KwktWuVmiHo+gJvntRivdrwB48L7Dy1KUa1ncTWOmaeL7NTNuh2N33Y09IgV 5mGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=thxbDtiW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u7-20020aa7d0c7000000b004161ecc3263si4041801edo.32.2022.03.07.02.15.09; Mon, 07 Mar 2022 02:15:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=thxbDtiW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238636AbiCGJsO (ORCPT + 99 others); Mon, 7 Mar 2022 04:48:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238928AbiCGJjB (ORCPT ); Mon, 7 Mar 2022 04:39:01 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C9FB6F49A; Mon, 7 Mar 2022 01:33:50 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BBB7B60FF6; Mon, 7 Mar 2022 09:33:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE577C36AE5; Mon, 7 Mar 2022 09:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1646645597; bh=70FazzljlNlduRTWOkMcv6aw843eOYsSOelHFwwLpLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=thxbDtiWVAHvXEoi1ryR/w4xj9soCEJQCt59fO6yZobTonXJu9c1l/DnYqXSRqzBO zCGvhWR0Ik/FDTlCusRRRAG0Dfgw+toW7jhkHZpFvTjcDifj8oCkthCySF53jJ6xdU dZwUQIaHdQo5MfznpMKFqG8RsigJ878wjxIXGdy0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sukadev Bhattiprolu , "David S. Miller" Subject: [PATCH 5.10 065/105] ibmvnic: register netdev after init of adapter Date: Mon, 7 Mar 2022 10:19:08 +0100 Message-Id: <20220307091646.008120724@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307091644.179885033@linuxfoundation.org> References: <20220307091644.179885033@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sukadev Bhattiprolu commit 570425f8c7c18b14fa8a2a58a0adb431968ad118 upstream. Finish initializing the adapter before registering netdev so state is consistent. Fixes: c26eba03e407 ("ibmvnic: Update reset infrastructure to support tunable parameters") Signed-off-by: Sukadev Bhattiprolu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ibm/ibmvnic.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -5383,6 +5383,12 @@ static int ibmvnic_probe(struct vio_dev goto ibmvnic_dev_file_err; netif_carrier_off(netdev); + + adapter->state = VNIC_PROBED; + + adapter->wait_for_reset = false; + adapter->last_reset_time = jiffies; + rc = register_netdev(netdev); if (rc) { dev_err(&dev->dev, "failed to register netdev rc=%d\n", rc); @@ -5390,10 +5396,6 @@ static int ibmvnic_probe(struct vio_dev } dev_info(&dev->dev, "ibmvnic registered\n"); - adapter->state = VNIC_PROBED; - - adapter->wait_for_reset = false; - adapter->last_reset_time = jiffies; return 0; ibmvnic_register_fail: