From nobody Tue Aug 20 12:43:44 2024 X-Original-To: dev-commits-src-main@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 4Wp8KD5Vjxz5T440; Tue, 20 Aug 2024 12:43:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wp8KD4zvfz4TBR; Tue, 20 Aug 2024 12:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724157824; 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=+m5r1p//1YsbV9K95dEQtvNtIk/2LDi22ny+791LYbk=; b=iVBQ3ZC0uYENEGccv+GSYYnZ00mMcfgGatvF3w9cPAvVNFY3MBm/MTicwySKdWX/m/icTz 1gSzjUhqQ6Ty1aj2A/gg/XmY5syxHhLMvDUwj7F5iTpmixLY/xpREHuJCYX7RvnUe/SIQV jXdjH/W49LaPc8K7dN6Pby0TZP5uMG1O8f7kEM4iOTSlaY2Usi6n9K+88S7gg00wKNTkgW exfdvBYRpqITjrJEoiluZKa6AdNdKz6fn4vqUxxrWZ/JFbHdx2eZr2D8LNZUudRrPY+wzP BR/3NgoSIrdvAyGySSma3XdDvx7OCDyozWjUoc0Wr8TZ2A9IS5Tf8u9cYasGoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724157824; a=rsa-sha256; cv=none; b=MZmA+9pFtjBRSsQYA5NQpZbfhvfBLXp+5cpciIkGF8i5Nu+UmESdfEmNyxnGOrM0GV0YMh WMT1AORo2tZcHdl7YmoJFWzrHu7qL2jVmQPh17VgBmx8bTRjd/q8NWNrjeHU2jZ6Xg0Yoc 7b/08iAej00n054WateD4rQhrmmXWguxPPmq/+4U8ErwowNjZSsiFv/VVOC0NGqU+YHli5 YbNmdy6iYJHAq/Ci0MFtHjsynEzlf+S4ZKJNnOE3o0hYuGGnHS8ysgd0WqHY1KxFVvCGZM voe1ansLyOW83voSu5Cf0gNWVbnfq/aRqosbtCAD5rqRb9BlJN23Rn6L529PJA== 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=1724157824; 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=+m5r1p//1YsbV9K95dEQtvNtIk/2LDi22ny+791LYbk=; b=prZPprCWpthhCP+Rad1VhR2z44r5olM5C6KEimpnOyfSq6CjfEBffG6oBv+UxDSkYippLM ywsJ3uamvkanXBArvhxfFcxrGmRcXH874pz2bBGOSrpd1mPbGbO2sa8pADPfd9QspwVIpr pgDOu9WmqotpUdpJCjR1ffSyuR7ke0aFjv/gyKpUiW1Zpmq1Rw2bXTqltiXivGbsNjOdJ3 xJJKH6Lo+ddBxwJV0ZFBsxVVjEn5FnhKCw9YNS46audXlVZjA7LsyWRJP8CMIxVgSnebWB Bq7YWzBRFJfAJcs7RZHwLTmxr0X7lnIqAdiFK8tz7m3Is8Ck0wUzlHg8g123Vg== 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 4Wp8KD4Zv4z11MD; Tue, 20 Aug 2024 12:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47KChiT0054197; Tue, 20 Aug 2024 12:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47KChi4d054194; Tue, 20 Aug 2024 12:43:44 GMT (envelope-from git) Date: Tue, 20 Aug 2024 12:43:44 GMT Message-Id: <202408201243.47KChi4d054194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2787f8c39c60 - main - mlx5en: stop including mlx5_accel/ipsec.h from en.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2787f8c39c60f7510f9bc04ec46fe0b37ece0e3e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2787f8c39c60f7510f9bc04ec46fe0b37ece0e3e commit 2787f8c39c60f7510f9bc04ec46fe0b37ece0e3e Author: Konstantin Belousov AuthorDate: 2024-07-31 22:13:33 +0000 Commit: Konstantin Belousov CommitDate: 2024-08-20 12:42:12 +0000 mlx5en: stop including mlx5_accel/ipsec.h from en.h This creates a circular dependency preventing inline functions from ipsec.h from using en.h definitions. Sponsored by: NVidia networking --- sys/dev/mlx5/mlx5_en/en.h | 1 - sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c | 1 + sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h index cdc8caa838d6..8966aeacb890 100644 --- a/sys/dev/mlx5/mlx5_en/en.h +++ b/sys/dev/mlx5/mlx5_en/en.h @@ -70,7 +70,6 @@ #include #include #include -#include #define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c index 1601557e52cc..ac275b5b145c 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c @@ -27,6 +27,7 @@ #include "opt_ratelimit.h" #include +#include #include #include diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index a80235f0f347..acb9f72b15c3 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -30,6 +30,7 @@ #include "opt_ratelimit.h" #include +#include #include #include