diff options
| author | Tejun Heo <tj@kernel.org> | 2014-03-07 10:23:57 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-03-07 10:23:57 -0500 |
| commit | 5078585a18c8cb7d1b6b7744fce842dadb3b7c72 (patch) | |
| tree | 0c3d8a25acd4b34f0d460bd9ef6173f72ec2ade2 /net/tipc/server.c | |
| parent | 7104ce9b349e0b0c9a71ee25efeb007057029677 (diff) | |
| parent | c3bebc71c4bcdafa24b506adf0c1de3c1f77e2e0 (diff) | |
Merge branch 'master' into wq/for-3.15
Pull 3.14-rc5 into wq/for-3.15 to receive nvme updates which the
scheduled PREPARE_DELAYED_WORK() updates depend on.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'net/tipc/server.c')
| -rw-r--r-- | net/tipc/server.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c index b635ca347a8..373979789a7 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c @@ -573,7 +573,6 @@ int tipc_server_start(struct tipc_server *s) kmem_cache_destroy(s->rcvbuf_cache); return ret; } - s->enabled = 1; return ret; } @@ -583,10 +582,6 @@ void tipc_server_stop(struct tipc_server *s) int total = 0; int id; - if (!s->enabled) - return; - - s->enabled = 0; spin_lock_bh(&s->idr_lock); for (id = 0; total < s->idr_in_use; id++) { con = idr_find(&s->conn_idr, id); |