diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-12-06 09:14:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-12-06 09:14:35 +0100 |
| commit | 78987584de42742bb46eaf55517a0475bfd7f032 (patch) | |
| tree | c1a54c004cfe8cd383bec5cf254d2e053133f098 /net/rds/tcp.c | |
| parent | e7af7b15121ca08c31a0ab9df71a41b4c53365b4 (diff) | |
| parent | d9d04527c79f0f7d9186272866526e871ef4ac6f (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/rds/tcp.c')
| -rw-r--r-- | net/rds/tcp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index fcddacc92e01..20e2923dc827 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -659,6 +659,8 @@ out_recv: out_pernet: unregister_pernet_subsys(&rds_tcp_net_ops); out_slab: + if (unregister_netdevice_notifier(&rds_tcp_dev_notifier)) + pr_warn("could not unregister rds_tcp_dev_notifier\n"); kmem_cache_destroy(rds_tcp_conn_slab); out: return ret; |