From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, Yevgeny Kliteynik <kliteyn@nvidia.com>,
Alex Vesker <valex@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>
Subject: [net-next 02/13] net/mlx5: DR, Remove unneeded rx_decap_l3 function for STEv1
Date: Fri, 12 Mar 2021 15:38:40 -0800 [thread overview]
Message-ID: <20210312233851.494832-3-saeed@kernel.org> (raw)
In-Reply-To: <20210312233851.494832-1-saeed@kernel.org>
From: Yevgeny Kliteynik <kliteyn@nvidia.com>
Remove the dr_ste_v1_set_rx_decap_l3 function that was
replaced by another function - fixing a rebase error.
Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: Alex Vesker <valex@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
.../mellanox/mlx5/core/steering/dr_ste_v1.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c
index 4088d6e51508..6f368ccc428e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste_v1.c
@@ -437,21 +437,6 @@ static void dr_ste_v1_set_rx_decap(u8 *hw_ste_p, u8 *s_action)
dr_ste_v1_set_reparse(hw_ste_p);
}
-static void dr_ste_v1_set_rx_decap_l3(u8 *hw_ste_p,
- u8 *s_action,
- u16 decap_actions,
- u32 decap_index)
-{
- MLX5_SET(ste_single_action_modify_list_v1, s_action, action_id,
- DR_STE_V1_ACTION_ID_MODIFY_LIST);
- MLX5_SET(ste_single_action_modify_list_v1, s_action, num_of_modify_actions,
- decap_actions);
- MLX5_SET(ste_single_action_modify_list_v1, s_action, modify_actions_ptr,
- decap_index);
-
- dr_ste_v1_set_reparse(hw_ste_p);
-}
-
static void dr_ste_v1_set_rewrite_actions(u8 *hw_ste_p,
u8 *s_action,
u16 num_of_actions,
@@ -571,9 +556,6 @@ static void dr_ste_v1_set_actions_rx(struct mlx5dr_domain *dmn,
bool allow_ctr = true;
if (action_type_set[DR_ACTION_TYP_TNL_L3_TO_L2]) {
- dr_ste_v1_set_rx_decap_l3(last_ste, action,
- attr->decap_actions,
- attr->decap_index);
dr_ste_v1_set_rewrite_actions(last_ste, action,
attr->decap_actions,
attr->decap_index);
--
2.29.2
next prev parent reply other threads:[~2021-03-12 23:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 23:38 [pull request][net-next 00/13] mlx5 updates 2021-03-12 Saeed Mahameed
2021-03-12 23:38 ` [net-next 01/13] net/mlx5: DR, Fixed typo in STE v0 Saeed Mahameed
2021-03-12 23:38 ` Saeed Mahameed [this message]
2021-03-12 23:38 ` [net-next 03/13] net/mlx5: DR, Add missing vhca_id consume from STEv1 Saeed Mahameed
2021-03-12 23:38 ` [net-next 04/13] net/mlx5: use kvfree() for memory allocated with kvzalloc() Saeed Mahameed
2021-03-12 23:38 ` [net-next 05/13] net/mlx5: remove unneeded semicolon Saeed Mahameed
2021-03-12 23:38 ` [net-next 06/13] net/mlx5: Read congestion counters from all ports when lag is active Saeed Mahameed
2021-03-12 23:38 ` [net-next 07/13] net/mlx5e: Remove redundant newline in NL_SET_ERR_MSG_MOD Saeed Mahameed
2021-03-12 23:38 ` [net-next 08/13] net/mlx5e: Use net_prefetchw instead of prefetchw in MPWQE TX datapath Saeed Mahameed
2021-03-12 23:38 ` [net-next 09/13] net/mlx5e: Dump ICOSQ WQE descriptor on CQE with error events Saeed Mahameed
2021-03-12 23:38 ` [net-next 10/13] net/mlx5e: allocate 'indirection_rqt' buffer dynamically Saeed Mahameed
2021-03-12 23:38 ` [net-next 11/13] net/mlx5: Display the command index in command mailbox dump Saeed Mahameed
2021-03-12 23:38 ` [net-next 12/13] net/mlx5: CT: Add support for mirroring Saeed Mahameed
2021-03-12 23:38 ` [net-next 13/13] net/mlx5e: Allow to match on ICMP parameters Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210312233851.494832-3-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=davem@davemloft.net \
--cc=kliteyn@nvidia.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@nvidia.com \
--cc=valex@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).