diff options
Diffstat (limited to 'net/tipc/server.c')
| -rw-r--r-- | net/tipc/server.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c index fd3fa57a410e..373979789a73 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | * @usr_data: user-specified field | 55 | * @usr_data: user-specified field |
| 56 | * @rx_action: what to do when connection socket is active | 56 | * @rx_action: what to do when connection socket is active |
| 57 | * @outqueue: pointer to first outbound message in queue | 57 | * @outqueue: pointer to first outbound message in queue |
| 58 | * @outqueue_lock: controll access to the outqueue | 58 | * @outqueue_lock: control access to the outqueue |
| 59 | * @outqueue: list of connection objects for its server | 59 | * @outqueue: list of connection objects for its server |
| 60 | * @swork: send work item | 60 | * @swork: send work item |
| 61 | */ | 61 | */ |
| @@ -573,7 +573,6 @@ int tipc_server_start(struct tipc_server *s) | |||
| 573 | kmem_cache_destroy(s->rcvbuf_cache); | 573 | kmem_cache_destroy(s->rcvbuf_cache); |
| 574 | return ret; | 574 | return ret; |
| 575 | } | 575 | } |
| 576 | s->enabled = 1; | ||
| 577 | return ret; | 576 | return ret; |
| 578 | } | 577 | } |
| 579 | 578 | ||
| @@ -583,10 +582,6 @@ void tipc_server_stop(struct tipc_server *s) | |||
| 583 | int total = 0; | 582 | int total = 0; |
| 584 | int id; | 583 | int id; |
| 585 | 584 | ||
| 586 | if (!s->enabled) | ||
| 587 | return; | ||
| 588 | |||
| 589 | s->enabled = 0; | ||
| 590 | spin_lock_bh(&s->idr_lock); | 585 | spin_lock_bh(&s->idr_lock); |
| 591 | for (id = 0; total < s->idr_in_use; id++) { | 586 | for (id = 0; total < s->idr_in_use; id++) { |
| 592 | con = idr_find(&s->conn_idr, id); | 587 | con = idr_find(&s->conn_idr, id); |
