diff options
author | Sridhar Samudrala <sri@us.ibm.com> | 2006-05-19 10:58:12 -0700 |
---|---|---|
committer | Sridhar Samudrala <sri@us.ibm.com> | 2006-05-19 10:58:12 -0700 |
commit | 8de8c8738086501bbe3057ed6f4b70dded657488 (patch) | |
tree | c8c5b4b5c3d3c35993368d0e462484cc62b006f4 /net/sctp/input.c | |
parent | ee433530d96a7b0af24ab616e5b51f1d89f9ae38 (diff) | |
download | op-kernel-dev-8de8c8738086501bbe3057ed6f4b70dded657488.zip op-kernel-dev-8de8c8738086501bbe3057ed6f4b70dded657488.tar.gz |
[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 d117ebc..7523f4d 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, union sctp_addr daddr; struct sctp_af *af; struct sock *sk = NULL; - struct sctp_association *asoc = NULL; + struct sctp_association *asoc; struct sctp_transport *transport = NULL; *app = NULL; *tpp = NULL; @@ -490,7 +490,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info) int type = skb->h.icmph->type; int code = skb->h.icmph->code; struct sock *sk; - struct sctp_association *asoc; + struct sctp_association *asoc = NULL; struct sctp_transport *transport; struct inet_sock *inet; char *saveip, *savesctp; |