diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-12-30 23:12:12 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-30 23:12:12 +0300 |
commit | aec53e60e0e665b359328b946654bc3ef77aed57 (patch) | |
tree | 55c6cc087d96f5ca9ec4bdd81134fd2471c02700 /net/smc/smc_core.h | |
parent | 49dc9013e34b205bae9d7a5f365a3da33c508c9d (diff) | |
parent | 74c78b4291b4466b44a57b3b7c3b98ad02628686 (diff) | |
download | linux-aec53e60e0e665b359328b946654bc3ef77aed57.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
commit 077cdda764c7 ("net/mlx5e: TC, Fix memory leak with rules with internal port")
commit 31108d142f36 ("net/mlx5: Fix some error handling paths in 'mlx5e_tc_add_fdb_flow()'")
commit 4390c6edc0fb ("net/mlx5: Fix some error handling paths in 'mlx5e_tc_add_fdb_flow()'")
https://lore.kernel.org/all/20211229065352.30178-1-saeed@kernel.org/
net/smc/smc_wr.c
commit 49dc9013e34b ("net/smc: Use the bitmap API when applicable")
commit 349d43127dac ("net/smc: fix kernel panic caused by race of smc_sock")
bitmap_zero()/memset() is removed by the fix
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/smc/smc_core.h')
-rw-r--r-- | net/smc/smc_core.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/smc/smc_core.h b/net/smc/smc_core.h index 59cef3b830d8..d63b08274197 100644 --- a/net/smc/smc_core.h +++ b/net/smc/smc_core.h @@ -415,6 +415,12 @@ static inline bool smc_link_usable(struct smc_link *lnk) return true; } +static inline bool smc_link_sendable(struct smc_link *lnk) +{ + return smc_link_usable(lnk) && + lnk->qp_attr.cur_qp_state == IB_QPS_RTS; +} + static inline bool smc_link_active(struct smc_link *lnk) { return lnk->state == SMC_LNK_ACTIVE; |