From nobody Sat Dec 30 00:24:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T230Y08Ghz55cX7; Sat, 30 Dec 2023 00:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T230X6hCnz4TDb; Sat, 30 Dec 2023 00:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703895884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p7qPCvkMOD9FDRRn/zXrFFCAXa0d0y3ThuC3YOCiGR8=; b=QD8juiC5UDGk27nkzFAmzA6MXBq8B9xlyoj06td/l33oL65IcreyOU1LTX08UCTG+vWFOf 8sPva9Rggntc6XjRl8D8qYhYcRmDVrju9DSU5lrNJ2rFHMV2HQT2POglzGcCOO6h4FPU4g /Wn1SQLL9EEW+oGZX9RjWEOzn5PpVKmN8HCRu2ixSt1f6U0oJ8wcCGPNsHPzVNoRXrU1dy E9IR0XdCZvGq0ZXvWTlRcE2ggIwekYqnagdIdAQkW8CjXbg6SvQGzms3PF5BT5uE4ckNux srwdTz1fsexaUixsP4N9saXj+WpBVKNcocdBcTZYfS6ZvHytbgldKENOkVYWZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703895884; a=rsa-sha256; cv=none; b=g7p3+3pbQFy8vBaCzmxUOs89KqWyBcSaNu19k/EgzAdo2fBMdfutah8e/mJqXzOoJvtKBU ItTKP72gBxkR7SKBWf8LK9qqLxqxcZUt9G8OXUZ4c/V0OQg8666pIohuedOlQiZa8tK4JY vvNJ89dM+iIS04cmmYg8od6DbEv4CxFX69l8TOTaZzcQEAMfF8wG485CcuQB+TtxgqDho1 ze2OW6aIp3wt7g8EdPU2rv7UPJUPQPPx4R0rQZ0k7ynPQ1ll5/foorpoVpygJl345VcR+V nQMiI6pFtc9DNtPwzwGB7RyOild2YkUWO+brqc5aSihRWNW3k5Fy9AVXLOqC9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703895884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p7qPCvkMOD9FDRRn/zXrFFCAXa0d0y3ThuC3YOCiGR8=; b=kpyj9Y7pQ+cVUmYvtsDS8t201gfhIAjp56zb8ucUZsQK8+S91iwqccQzb2pTJHNnKCO49f zELBRjFSskueEGVawXXmH8yBrqfDLhdTCm8KoMumB5GQg1c1xIgZcYk7owW8Bcn+PInD3g 8kqiCepj4rV/bNfuWU8InRNgntlKipWXuo+bUrEUfem6nSyFm+yy7nEqRw5IFtNTv1XGos m9iq3bFJTM3cYRU1+/gKJ+8XDS7zMOvw50zP38BCw3L0DWYbAsRO5XYYJbbESGAzOkjQQj Jao4FG0Owbr4+C8DOM0JVp/Ta12wGz9ETACz0PmrEKakfg7IBEOHSzirzYAjwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T230X5jG7zCmD; Sat, 30 Dec 2023 00:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BU0Oi1d009606; Sat, 30 Dec 2023 00:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BU0OifH009603; Sat, 30 Dec 2023 00:24:44 GMT (envelope-from git) Date: Sat, 30 Dec 2023 00:24:44 GMT Message-Id: <202312300024.3BU0OifH009603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1e9df419f14c - stable/14 - mlx4(5): fix driver initialization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e9df419f14c059aba8d6704256da5c7af4f182a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1e9df419f14c059aba8d6704256da5c7af4f182a commit 1e9df419f14c059aba8d6704256da5c7af4f182a Author: Yuji Hagiwara AuthorDate: 2023-12-23 20:53:02 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-30 00:24:07 +0000 mlx4(5): fix driver initialization PR: 275897 MFC after: 1 week (cherry picked from commit 553ed8e38bfdd4832deecdec1c0b023824dcff94) --- sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c b/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c index c26afc0099b5..583de1816d1b 100644 --- a/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c +++ b/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c @@ -2293,7 +2293,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, dev_addr[ETHER_ADDR_LEN - 1 - i] = (u8) (priv->mac >> (8 * i)); - ether_ifattach(dev, dev_addr); if_link_state_change(dev, LINK_STATE_DOWN); ifmedia_init(&priv->media, IFM_IMASK | IFM_ETH_FMASK, mlx4_en_media_change, mlx4_en_media_status); @@ -2306,6 +2305,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, DEBUGNET_SET(dev, mlx4_en); + ether_ifattach(dev, dev_addr); + en_warn(priv, "Using %d TX rings\n", prof->tx_ring_num); en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);