Commit 33b18a0f authored by Jianbo Liu's avatar Jianbo Liu Committed by Jakub Kicinski
Browse files

net/mlx5e: Change the parameter of IPsec RX skb handle function 



Refactor the function to pass in reg B value only.

Signed-off-by: default avatarJianbo Liu <jianbol@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/3b3c53f64660d464893eaecc41298b1ce49c6baa.1690802064.git.leon@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fbd51754

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c

+1 −2
Original line number Diff line number Diff line
@@ -309,9 +309,8 @@ enum { 


void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev,

				       struct sk_buff *skb,

				       struct mlx5_cqe64 *cqe)

				       u32 ipsec_meta_data)

{

	u32 ipsec_meta_data = be32_to_cpu(cqe->ft_metadata);

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5e_ipsec *ipsec = priv->ipsec;

	struct mlx5e_ipsec_sa_entry *sa_entry;

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void mlx5e_ipsec_handle_tx_wqe(struct mlx5e_tx_wqe *wqe, 
			       struct mlx5_wqe_inline_seg *inlseg);

void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev,

				       struct sk_buff *skb,

				       struct mlx5_cqe64 *cqe);

				       u32 ipsec_meta_data);

static inline unsigned int mlx5e_ipsec_tx_ids_len(struct mlx5e_accel_tx_ipsec_state *ipsec_st)

{

	return ipsec_st->tailen;
@@ -145,7 +145,7 @@ mlx5e_ipsec_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
static inline

void mlx5e_ipsec_offload_handle_rx_skb(struct net_device *netdev,

				       struct sk_buff *skb,

				       struct mlx5_cqe64 *cqe)

				       u32 ipsec_meta_data)

{}



static inline bool mlx5e_ipsec_eseg_meta(struct mlx5_wqe_eth_seg *eseg)

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

+2 −1
Original line number Diff line number Diff line
@@ -1543,7 +1543,8 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe, 
		mlx5e_ktls_handle_rx_skb(rq, skb, cqe, &cqe_bcnt);



	if (unlikely(mlx5_ipsec_is_rx_flow(cqe)))

		mlx5e_ipsec_offload_handle_rx_skb(netdev, skb, cqe);

		mlx5e_ipsec_offload_handle_rx_skb(netdev, skb,

						  be32_to_cpu(cqe->ft_metadata));



	if (unlikely(mlx5e_macsec_is_rx_flow(cqe)))

		mlx5e_macsec_offload_handle_rx_skb(netdev, skb, cqe);