diff options
| author |  Jakub Kicinski <kuba@kernel.org>
| 2024-01-25 14:00:54 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org>
| 2024-01-25 14:20:08 -0800 |
| commit | 06f609b3119876b42f19fdb690b10896d3c648e6 (patch) | |
| tree | 2f42b892152af80d299133ef6c902261a1fd0b98 /net/smc | |
| parent | net: dsa: mt7530: support OF-based registration of switch MDIO bus (diff) | |
| parent | Merge tag 'net-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-06f609b3119876b42f19fdb690b10896d3c648e6.tar.gz linux-06f609b3119876b42f19fdb690b10896d3c648e6.tar.bz2 linux-06f609b3119876b42f19fdb690b10896d3c648e6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/smc_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c index 32bad267fa3e..6fdb2d96777a 100644 --- a/net/smc/smc_diag.c +++ b/net/smc/smc_diag.c @@ -164,7 +164,7 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb, } if (smc_conn_lgr_valid(&smc->conn) && smc->conn.lgr->is_smcd && (req->diag_ext & (1 << (SMC_DIAG_DMBINFO - 1))) && - !list_empty(&smc->conn.lgr->list)) { + !list_empty(&smc->conn.lgr->list) && smc->conn.rmb_desc) { struct smc_connection *conn = &smc->conn; struct smcd_diag_dmbinfo dinfo; struct smcd_dev *smcd = conn->lgr->smcd; |