diff options
| author |   Jon Paul Maloy <jon.maloy@ericsson.com> | 2015-07-30 18:24:23 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-07-30 17:25:14 -0700 |
| commit | 598411d70f85dcf5b5c6c2369cc48637c251b656 (patch) | |
| tree | 488847de32b5fa2edb9ed7dea046e5b10d7ecea3 /net/tipc/link.c | |
| parent | tipc: move received discovery data evaluation inside node.c (diff) | |
| download | linux-dev-598411d70f85dcf5b5c6c2369cc48637c251b656.tar.xz linux-dev-598411d70f85dcf5b5c6c2369cc48637c251b656.zip | |
tipc: make resetting of links non-atomic
In order to facilitate future improvements to the locking structure, we
want to make resetting and establishing of links non-atomic. I.e., the
functions tipc_node_link_up() and tipc_node_link_down() should be called
from outside the node lock context, and grab/release the node lock
themselves. This requires that we can freeze the link state from the
moment it is set to RESETTING or PEER_RESET in one lock context until
it is set to RESET or ESTABLISHING in a later context. The recently
introduced link FSM makes this possible, so we are now ready to introduce
the above change.
This commit implements this.
Tested-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 9840b03348e1..3a92924711a1 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -489,8 +489,8 @@ int tipc_link_timeout(struct tipc_link *l, struct sk_buff_head *xmitq) xmit = true; mtyp = ACTIVATE_MSG; break; - case LINK_RESETTING: case LINK_PEER_RESET: + case LINK_RESETTING: case LINK_FAILINGOVER: break; default: |