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 <[email protected]>

diff --combined net/smc/smc_diag.c
index 32bad267fa3e2729b833cb711a6bb946bc7229d9,5a33908015f3e3197ad11869c6f5134799307c56..6fdb2d96777ad704c394709ec845f9ddef5e599a
--- 1/net/smc/smc_diag.c
--- 2/net/smc/smc_diag.c
+++ b/net/smc/smc_diag.c
@@@ -164,7 -164,7 +164,7 @@@ static int __smc_diag_dump(struct sock 
        }
        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;
@@@ -255,7 -255,6 +255,7 @@@ static int smc_diag_handler_dump(struc
  }
  
  static const struct sock_diag_handler smc_diag_handler = {
 +      .owner = THIS_MODULE,
        .family = AF_SMC,
        .dump = smc_diag_handler_dump,
  };