diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-06-26 10:10:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-26 10:10:16 -0700 |
| commit | 8a53058bd9bae9a4381209a8122c60ac346622ef (patch) | |
| tree | 6b49ef1319ea4efc0838a85d71b746c3c1ba8e13 | |
| parent | bonding: Always enable vlan tx offload (diff) | |
| parent | net/smc: Fix error path in smc_init (diff) | |
| download | linux-dev-8a53058bd9bae9a4381209a8122c60ac346622ef.tar.xz linux-dev-8a53058bd9bae9a4381209a8122c60ac346622ef.zip | |
Merge branch 'smc-fixes'
Ursula Braun says:
====================
net/smc: fixes 2019-06-26
here are 2 small smc fixes for the net tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/smc/af_smc.c | 5 | ||||
| -rw-r--r-- | net/smc/smc_core.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 0c874e996f85..7621ec2f539c 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -2029,7 +2029,7 @@ static int __init smc_init(void) rc = smc_pnet_init(); if (rc) - return rc; + goto out_pernet_subsys; rc = smc_llc_init(); if (rc) { @@ -2080,6 +2080,9 @@ out_proto: proto_unregister(&smc_proto); out_pnet: smc_pnet_exit(); +out_pernet_subsys: + unregister_pernet_subsys(&smc_net_ops); + return rc; } diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index 2d2850adc2a3..4ca50ddf8d16 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -652,7 +652,10 @@ create: rc = smc_lgr_create(smc, ini); if (rc) goto out; + lgr = conn->lgr; + write_lock_bh(&lgr->conns_lock); smc_lgr_register_conn(conn); /* add smc conn to lgr */ + write_unlock_bh(&lgr->conns_lock); } conn->local_tx_ctrl.common.type = SMC_CDC_MSG_TYPE; conn->local_tx_ctrl.len = SMC_WR_TX_SIZE; |