hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
David S. Miller 2019-06-26 10:10:16 -07:00
parent 30d8177e8a 8c33bf1b0a
commit 8a53058bd9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/smc/af_smc.c
View File

@ -2029,7 +2029,7 @@ static int __init smc_init(void)
rc = smc_pnet_init(); rc = smc_pnet_init();
if (rc) if (rc)
return rc; goto out_pernet_subsys;
rc = smc_llc_init(); rc = smc_llc_init();
if (rc) { if (rc) {
@ -2080,6 +2080,9 @@ out_proto:
proto_unregister(&smc_proto); proto_unregister(&smc_proto);
out_pnet: out_pnet:
smc_pnet_exit(); smc_pnet_exit();
out_pernet_subsys:
unregister_pernet_subsys(&smc_net_ops);
return rc; return rc;
} }

3
net/smc/smc_core.c
View File

@ -652,7 +652,10 @@ create:
rc = smc_lgr_create(smc, ini); rc = smc_lgr_create(smc, ini);
if (rc) if (rc)
goto out; goto out;
lgr = conn->lgr;
write_lock_bh(&lgr->conns_lock);
smc_lgr_register_conn(conn); /* add smc conn to lgr */ 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.common.type = SMC_CDC_MSG_TYPE;
conn->local_tx_ctrl.len = SMC_WR_TX_SIZE; conn->local_tx_ctrl.len = SMC_WR_TX_SIZE;