diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/tipc/config.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/tipc/config.c')
| -rw-r--r-- | net/tipc/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/config.c b/net/tipc/config.c index 3c8e6740e5ae..48b5de2dbe60 100644 --- a/net/tipc/config.c +++ b/net/tipc/config.c | |||
| @@ -683,11 +683,11 @@ int tipc_cfg_init(void) | |||
| 683 | memset(&mng, 0, sizeof(mng)); | 683 | memset(&mng, 0, sizeof(mng)); |
| 684 | INIT_LIST_HEAD(&mng.link_subscribers); | 684 | INIT_LIST_HEAD(&mng.link_subscribers); |
| 685 | 685 | ||
| 686 | res = tipc_attach(&mng.user_ref, 0, 0); | 686 | res = tipc_attach(&mng.user_ref, NULL, NULL); |
| 687 | if (res) | 687 | if (res) |
| 688 | goto failed; | 688 | goto failed; |
| 689 | 689 | ||
| 690 | res = tipc_createport(mng.user_ref, 0, TIPC_CRITICAL_IMPORTANCE, | 690 | res = tipc_createport(mng.user_ref, NULL, TIPC_CRITICAL_IMPORTANCE, |
| 691 | NULL, NULL, NULL, | 691 | NULL, NULL, NULL, |
| 692 | NULL, cfg_named_msg_event, NULL, | 692 | NULL, cfg_named_msg_event, NULL, |
| 693 | NULL, &mng.port_ref); | 693 | NULL, &mng.port_ref); |