net/mlx5e: Fix build break when CONFIG_XPS is not set (8b5ec43d) · Commits · 戴 / test

mlx5e_accel_sk_get_rxq is only used in ktls_rx.c file which already depends on XPS to be compiled, move it from the generic en_accel.h header to be local in ktls_rx.c, to fix the below build break In file included from ../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:49:0: ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h: In function ‘mlx5e_accel_sk_get_rxq’: ../drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h:153:12: error: implicit declaration of function ‘sk_rx_queue_get’ ... int rxq = sk_rx_queue_get(sk); ^~~~~~~~~~~~~~~ Fixes: ("net/mlx5e: kTLS, Add kTLS RX HW offload support") Signed-off-by:

Saeed Mahameed <saeedm@mellanox.com> Reported-by:

Randy Dunlap <rdunlap@infradead.org>

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -148,16 +148,6 @@ static inline bool mlx5e_accel_tx_finish(struct mlx5e_priv *priv,
		return true;
		}

		static inline int mlx5e_accel_sk_get_rxq(struct sock *sk)
		{
		int rxq = sk_rx_queue_get(sk);

		if (unlikely(rxq == -1))
		rxq = 0;

		return rxq;
		}

		static inline int mlx5e_accel_init_rx(struct mlx5e_priv *priv)
		{
		return mlx5e_ktls_init_rx(priv);

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -547,6 +547,16 @@ void mlx5e_ktls_handle_ctx_completion(struct mlx5e_icosq_wqe_info *wi)
		queue_work(rule->priv->tls->rx_wq, &rule->work);
		}

		static int mlx5e_ktls_sk_get_rxq(struct sock *sk)
		{
		int rxq = sk_rx_queue_get(sk);

		if (unlikely(rxq == -1))
		rxq = 0;

		return rxq;
		}

		int mlx5e_ktls_add_rx(struct net_device netdev, struct sock sk,
		struct tls_crypto_info *crypto_info,
		u32 start_offload_tcp_sn)
		@@ -573,7 +583,7 @@ int mlx5e_ktls_add_rx(struct net_device netdev, struct sock sk,
		priv_rx->crypto_info =
		(struct tls12_crypto_info_aes_gcm_128 )crypto_info;

		rxq = mlx5e_accel_sk_get_rxq(sk);
		rxq = mlx5e_ktls_sk_get_rxq(sk);
		priv_rx->rxq = rxq;
		priv_rx->sk = sk;

Admin message