From nobody Wed Apr 13 23:09:37 2022 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 334821B40D52; Wed, 13 Apr 2022 23:09:38 +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 4KdywK4d7bz4m0v; Wed, 13 Apr 2022 23:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891377; 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=BvoZo2Y9T57YJuPVKpybcVZpnMtsbcZaJjT3AookeuQ=; b=EmbkfdovdHg8t+wYlJWW2U92QX22PshT4ftFmLQEtMGw4ES+T1ylsL3aJVnH0mYS1phIfy nNXqSu1kR1hC4DuP9bP7pcyyFZXOhVOpEM5l1gblFfsWHjh1/54Z/Tshvf2ZsRN3eTa6DY CmQyM48+4ldkpQIkwCzUpXShrozJ4pCmBcKtsOmTbgNcfkDBViQPunuxisHPPdwyhlRH7p g7ypAHET+YCvjXlyXaWmUlyGW6+IooiCAx8WzDJ1VeJ3HaNflaXk22qN+k0FecMj4iTpXG isX8GaO5PNY6AhDraefEyfHBXHOnQmhyDfPJXxlTkxokFegS3Mqy+rFiRHshfw== 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 31E1615385; Wed, 13 Apr 2022 23:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23DN9b07074613; Wed, 13 Apr 2022 23:09:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9b0W074612; Wed, 13 Apr 2022 23:09:37 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:37 GMT Message-Id: <202204132309.23DN9b0W074612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 75095cd38f07 - main - mlx5: fs_tcp is only used for INET or INET6. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75095cd38f078bacf57b29c38a62ba5d2325e54d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891377; 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=BvoZo2Y9T57YJuPVKpybcVZpnMtsbcZaJjT3AookeuQ=; b=SkWOXAYk3hMrP+UEgwxi9mNvIxZW0ELgcu6mJzYwlBsPEiLLMRWZCImziwB8f5LI7nOFja 93ojiqgBPAkMAs9UisCojMLEC8mrAqQEyofdywck7nQFHJ8Mcqx7/RE0fGVObbPskmrhTt 7a+iElO4+kxagPqoQr9YmitqTJLI1NIephhUOz+tSFq68iyrDnygyE4bZjfZrDPvDiyJ76 IjUhtwLtqYCImZc5pt9FFqqotkWAfIC1WZD6Sw5b0T2vIC+de44S9re9gB0z2RBltK6yCz Bfw4aeIRyP8cHYbLVVuEw5WJGv0lb1NLI9GxX5S5NSMhsOOL3+vzFWGXRk7QNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891377; a=rsa-sha256; cv=none; b=RYjTAPJiSrGyp8+jb07ZLzEId7bAvXx8ccn52jTxG7Wba7DUfoouBlCNR6gb8XPimnpe5u 0JdoxDwKhG3bMiAAH8q6gMFMJIR85qZT9/KH2VhokqeJDaqI0RPpUg+E+TEMpvaZupTCVZ tRiuP/qr1R94HktrDZQPdK7h5pDA0WxPLcA91iUuC6MxOd+zkqwLQWxO86T64Vi6wH7R7d NesMf6hzGdVEYwSRumeOXK1qwbaDxUIeiAEbxLiMh/eaPoIa1itCsz3rGgjJ7NEaURuOSy O73YBCPuQIG3sp1DL23ZrPzUEK/AAMdxPQAFtUVFRhqmdiPkpwZPDQHOcMYGLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=75095cd38f078bacf57b29c38a62ba5d2325e54d commit 75095cd38f078bacf57b29c38a62ba5d2325e54d Author: John Baldwin AuthorDate: 2022-04-13 23:08:21 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:21 +0000 mlx5: fs_tcp is only used for INET or INET6. --- sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c index 543c7a4ef502..415869516a27 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_tcp.c @@ -93,7 +93,9 @@ mlx5e_accel_fs_add_inpcb(struct mlx5e_priv *priv, { struct mlx5_flow_destination dest = {}; struct mlx5e_flow_table *ft = NULL; - struct mlx5e_accel_fs_tcp *fs_tcp; +#if defined(INET) || defined(INET6) + struct mlx5e_accel_fs_tcp *fs_tcp = &priv->fts.accel_tcp; +#endif struct mlx5_flow_rule *flow; struct mlx5_flow_spec *spec; @@ -101,8 +103,6 @@ mlx5e_accel_fs_add_inpcb(struct mlx5e_priv *priv, if (!spec) return (ERR_PTR(-ENOMEM)); - fs_tcp = &priv->fts.accel_tcp; - spec->match_criteria_enable = MLX5_MATCH_OUTER_HEADERS; INP_RLOCK(inp);