Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/mlx5e: fix up for "net/mlx5e: Move MACsec flow steering operations to be used as core library"

Recent merge had a conflict in:

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

between commit:

aeb660171b06 ("net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groups")

from Linus' tree and commit:

cb5ebe4896f9 ("net/mlx5e: Move MACsec flow steering operations to be used as core library")

from the mlx5-next tree. This was missed and the former commit
got lost, bring it back.

Fixes: 3c5066c6b0a5 ("Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20230815123725.4ef5b7b9@canb.auug.org.au
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Stephen Rothwell and committed by
Jakub Kicinski
10ea77e4 59da9885

+1
+1
drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
··· 278 278 279 279 if (!in) { 280 280 kfree(ft->g); 281 + ft->g = NULL; 281 282 return -ENOMEM; 282 283 } 283 284