diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-26 12:12:45 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-26 12:12:45 +0300 |
| commit | 6fae257f0b294d7abe7adfb08277bfd5472ed717 (patch) | |
| tree | 22ee5582cff79487dac0d26bbc07593980472428 /drivers/infiniband/sw/rxe/rxe.c | |
| parent | 7cc4ef8ed132e72ba44804cae3ddb2587ff757d6 (diff) | |
| parent | 08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff) | |
| download | linux-6fae257f0b294d7abe7adfb08277bfd5472ed717.tar.xz | |
Merge tag 'v4.8-rc8' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe.c')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c index 55f0e8f0ca79..ddd59270ff6d 100644 --- a/drivers/infiniband/sw/rxe/rxe.c +++ b/drivers/infiniband/sw/rxe/rxe.c @@ -362,15 +362,34 @@ static int __init rxe_module_init(void) return err; } - err = rxe_net_init(); + err = rxe_net_ipv4_init(); if (err) { - pr_err("rxe: unable to init\n"); + pr_err("rxe: unable to init ipv4 tunnel\n"); rxe_cache_exit(); - return err; + goto exit; + } + + err = rxe_net_ipv6_init(); + if (err) { + pr_err("rxe: unable to init ipv6 tunnel\n"); + rxe_cache_exit(); + goto exit; } + + err = register_netdevice_notifier(&rxe_net_notifier); + if (err) { + pr_err("rxe: Failed to rigister netdev notifier\n"); + goto exit; + } + pr_info("rxe: loaded\n"); return 0; + +exit: + rxe_release_udp_tunnel(recv_sockets.sk4); + rxe_release_udp_tunnel(recv_sockets.sk6); + return err; } static void __exit rxe_module_exit(void) |