diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-27 21:06:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-27 21:06:39 -0700 |
| commit | d96ff269a04be286989ead13bf8b4be55bdee8ee (patch) | |
| tree | 46b6d010a9a4dfe96dc86339d1cbded8874c6b8f /net/smc | |
| parent | 3a49584477ff4c8838833be9f3b7cc13f0f7c0d3 (diff) | |
| parent | 556e2f6020bf90f63c5dd65e9a2254be6db3185b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.
In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.
The aquantia driver conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
| -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 828e319fdc0a..302e355f2ebc 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -2020,7 +2020,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) { @@ -2071,6 +2071,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; |