Commit 9db7e618 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by David S. Miller
Browse files

net/mlx5e: Convert single case statement switch statements into if statements 



During the review of commit 1ff2f0fa ("net/mlx5e: Return in default
case statement in tx_post_resync_params"), Leon and Nick pointed out
that the switch statements can be converted to single if statements
that return early so that the code is easier to follow.

Suggested-by: default avatarLeon Romanovsky <leon@kernel.org>
Suggested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3194d6ad

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

+11 −23
Original line number Original line Diff line number Diff line
@@ -25,23 +25,17 @@ static void 
fill_static_params_ctx(void *ctx, struct mlx5e_ktls_offload_context_tx *priv_tx)

fill_static_params_ctx(void *ctx, struct mlx5e_ktls_offload_context_tx *priv_tx)

{

{

	struct tls_crypto_info *crypto_info = priv_tx->crypto_info;

	struct tls_crypto_info *crypto_info = priv_tx->crypto_info;

	struct tls12_crypto_info_aes_gcm_128 *info;

	char *initial_rn, *gcm_iv;

	char *initial_rn, *gcm_iv;

	u16 salt_sz, rec_seq_sz;

	u16 salt_sz, rec_seq_sz;

	char *salt, *rec_seq;

	char *salt, *rec_seq;

	u8 tls_version;

	u8 tls_version;





	switch (crypto_info->cipher_type) {

	if (WARN_ON(crypto_info->cipher_type != TLS_CIPHER_AES_GCM_128))

	case TLS_CIPHER_AES_GCM_128: {

		return;

		struct tls12_crypto_info_aes_gcm_128 *info =

			(struct tls12_crypto_info_aes_gcm_128 *)crypto_info;





	info = (struct tls12_crypto_info_aes_gcm_128 *)crypto_info;

	EXTRACT_INFO_FIELDS;

	EXTRACT_INFO_FIELDS;

		break;

	}

	default:

		WARN_ON(1);

		return;

	}





	gcm_iv      = MLX5_ADDR_OF(tls_static_params, ctx, gcm_iv);

	gcm_iv      = MLX5_ADDR_OF(tls_static_params, ctx, gcm_iv);

	initial_rn  = MLX5_ADDR_OF(tls_static_params, ctx, initial_record_number);

	initial_rn  = MLX5_ADDR_OF(tls_static_params, ctx, initial_record_number);
@@ -234,24 +228,18 @@ tx_post_resync_params(struct mlx5e_txqsq *sq, 
		      u64 rcd_sn)

		      u64 rcd_sn)

{

{

	struct tls_crypto_info *crypto_info = priv_tx->crypto_info;

	struct tls_crypto_info *crypto_info = priv_tx->crypto_info;

	struct tls12_crypto_info_aes_gcm_128 *info;

	__be64 rn_be = cpu_to_be64(rcd_sn);

	__be64 rn_be = cpu_to_be64(rcd_sn);

	bool skip_static_post;

	bool skip_static_post;

	u16 rec_seq_sz;

	u16 rec_seq_sz;

	char *rec_seq;

	char *rec_seq;





	switch (crypto_info->cipher_type) {

	if (WARN_ON(crypto_info->cipher_type != TLS_CIPHER_AES_GCM_128))

	case TLS_CIPHER_AES_GCM_128: {

		return;

		struct tls12_crypto_info_aes_gcm_128 *info =

			(struct tls12_crypto_info_aes_gcm_128 *)crypto_info;





	info = (struct tls12_crypto_info_aes_gcm_128 *)crypto_info;

	rec_seq = info->rec_seq;

	rec_seq = info->rec_seq;

	rec_seq_sz = sizeof(info->rec_seq);

	rec_seq_sz = sizeof(info->rec_seq);

		break;

	}

	default:

		WARN_ON(1);

		return;

	}





	skip_static_post = !memcmp(rec_seq, &rn_be, rec_seq_sz);

	skip_static_post = !memcmp(rec_seq, &rn_be, rec_seq_sz);

	if (!skip_static_post)

	if (!skip_static_post)

CRA Git | Maintained and supported by SUSTech CRA and CCSE