diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /net/sctp/sm_sideeffect.c | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
-rw-r--r-- | net/sctp/sm_sideeffect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index efa516b47e81..9bc1bfc64b69 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
@@ -718,7 +718,7 @@ static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds, | |||
718 | 718 | ||
719 | if (sctp_style(sk, TCP)) { | 719 | if (sctp_style(sk, TCP)) { |
720 | /* Change the sk->sk_state of a TCP-style socket that has | 720 | /* Change the sk->sk_state of a TCP-style socket that has |
721 | * sucessfully completed a connect() call. | 721 | * successfully completed a connect() call. |
722 | */ | 722 | */ |
723 | if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) | 723 | if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED)) |
724 | sk->sk_state = SCTP_SS_ESTABLISHED; | 724 | sk->sk_state = SCTP_SS_ESTABLISHED; |