diff options
author | David S. Miller <davem@davemloft.net> | 2012-02-29 23:52:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-29 23:52:12 -0500 |
commit | 06b8db9cac717fcd6b8410b9efae8aca33b4b9e6 (patch) | |
tree | 446f012fcc33602e7ce2e5ec5b6e3df7eb435c63 /net/tipc/subscr.c | |
parent | 9100eb012a31dcc3f6eff1f09eb9e118b1e5b6c4 (diff) | |
parent | 9bbbc59dbd4e69da078b65a7f708c4250984dd29 (diff) |
Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'net/tipc/subscr.c')
-rw-r--r-- | net/tipc/subscr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c index 8c49566da8f3..b2964e9895d3 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c @@ -552,7 +552,7 @@ int tipc_subscr_start(void) if (res) goto failed; - res = tipc_nametbl_publish_rsv(topsrv.setup_port, TIPC_NODE_SCOPE, &seq); + res = tipc_publish(topsrv.setup_port, TIPC_NODE_SCOPE, &seq); if (res) { tipc_deleteport(topsrv.setup_port); topsrv.setup_port = 0; |