diff options
author | Sridhar Samudrala <sri@us.ibm.com> | 2006-05-19 13:58:12 -0400 |
---|---|---|
committer | Sridhar Samudrala <sri@us.ibm.com> | 2006-05-19 13:58:12 -0400 |
commit | 8de8c8738086501bbe3057ed6f4b70dded657488 (patch) | |
tree | c8c5b4b5c3d3c35993368d0e462484cc62b006f4 /net/sctp/input.c | |
parent | ee433530d96a7b0af24ab616e5b51f1d89f9ae38 (diff) |
[SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure.
Also fix some other cases where sk_err is not set for 1-1 style sockets.
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Diffstat (limited to 'net/sctp/input.c')
-rw-r--r-- | net/sctp/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index d117ebc75cf8..7523f4df2da6 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c | |||
@@ -412,7 +412,7 @@ struct sock *sctp_err_lookup(int family, struct sk_buff *skb, | |||
412 | union sctp_addr daddr; | 412 | union sctp_addr daddr; |
413 | struct sctp_af *af; | 413 | struct sctp_af *af; |
414 | struct sock *sk = NULL; | 414 | struct sock *sk = NULL; |
415 | struct sctp_association *asoc = NULL; | 415 | struct sctp_association *asoc; |
416 | struct sctp_transport *transport = NULL; | 416 | struct sctp_transport *transport = NULL; |
417 | 417 | ||
418 | *app = NULL; *tpp = NULL; | 418 | *app = NULL; *tpp = NULL; |
@@ -490,7 +490,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info) | |||
490 | int type = skb->h.icmph->type; | 490 | int type = skb->h.icmph->type; |
491 | int code = skb->h.icmph->code; | 491 | int code = skb->h.icmph->code; |
492 | struct sock *sk; | 492 | struct sock *sk; |
493 | struct sctp_association *asoc; | 493 | struct sctp_association *asoc = NULL; |
494 | struct sctp_transport *transport; | 494 | struct sctp_transport *transport; |
495 | struct inet_sock *inet; | 495 | struct inet_sock *inet; |
496 | char *saveip, *savesctp; | 496 | char *saveip, *savesctp; |