On Fri, 19 Jun 2026 16:08:12 +0800
[email protected] wrote:
> diff --git a/drivers/net/sxe2/sxe2_cmd_chnl.c
> b/drivers/net/sxe2/sxe2_cmd_chnl.c
> index 19323ffcc4..7711e8e57d 100644
> --- a/drivers/net/sxe2/sxe2_cmd_chnl.c
> +++ b/drivers/net/sxe2/sxe2_cmd_chnl.c
> @@ -877,3 +877,200 @@ int32_t sxe2_drv_tm_commit(struct sxe2_adapter *adapter)
> l_end:
...
> +int32_t sxe2_drv_ipsec_txsa_delete(struct sxe2_adapter *adapter,
> + uint16_t sa_id)
> +{
> + struct sxe2_drv_ipsec_txsa_del_req req = { 0 };
> + struct sxe2_drv_cmd_params cmd = { 0 };
> + struct sxe2_common_device *cdev = adapter->cdev;
> + int32_t ret = -1;
> +
> + req.sa_idx = rte_cpu_to_le_16(sa_id);
> + sxe2_drv_cmd_params_fill(adapter, &cmd, SXE2_DRV_CMD_IPSEC_TXSA_DEL,
> + &req, sizeof(req),
> + NULL, 0);
> + ret = sxe2_drv_cmd_exec(cdev, &cmd);
> + if (ret)
> + PMD_DEV_LOG_ERR(adapter, DRV,
> + "Failed to delete tx sa, sa id: %u, ret: %d.",
> + sa_id, ret);
> +
> + return ret;
> +}
> +
git merge doesn't like extra blank lines at end of file.
Applying: net/sxe2: support IPsec inline protocol offload
/home/shemminger/DPDK/main/.git/worktrees/sxe2/rebase-apply/patch:236: new
blank line at EOF.
+
warning: 1 line adds whitespace errors.
