Dave,
Could you try pulling the following SCTP updates from
master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6.git
I am also including the patches inline in case the pull doesn't work for you.
Thanks
Sridhar
---------------------------------------------------------------------------------
[SCTP]: Return socket errors only if the receive queue is empty.
This patch fixes an issue where it is possible to get valid data after
a ENOTCONN error. It returns socket errors only after data queued on
socket receive queue is consumed.
Signed-off-by: Neil Horman <[EMAIL PROTECTED]>
Signed-off-by: Sridhar Samudrala <[EMAIL PROTECTED]>
---
commit d4a6393449d96d4e4713896e5de37301f14673f6
tree 4e14681b55389d6d5b6fd43dba4fdbc792b4d836
parent 5666c0947ede0432ba5148570aa66ffb9febff5b
author Neil Horman <[EMAIL PROTECTED]> Thu, 01 Dec 2005 16:35:33 -0800
committer Sridhar Samudrala <[EMAIL PROTECTED]> Thu, 01 Dec 2005 16:35:33 -0800
net/sctp/socket.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index abab81f..d890dfa 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4743,11 +4743,6 @@ static struct sk_buff *sctp_skb_recv_dat
struct sk_buff *skb;
long timeo;
- /* Caller is allowed not to check sk->sk_err before calling. */
- error = sock_error(sk);
- if (error)
- goto no_packet;
-
timeo = sock_rcvtimeo(sk, noblock);
SCTP_DEBUG_PRINTK("Timeout: timeo: %ld, MAX: %ld.\n",
@@ -4774,6 +4769,11 @@ static struct sk_buff *sctp_skb_recv_dat
if (skb)
return skb;
+ /* Caller is allowed not to check sk->sk_err before calling. */
+ error = sock_error(sk);
+ if (error)
+ goto no_packet;
+
if (sk->sk_shutdown & RCV_SHUTDOWN)
break;
---------------------------------------------------------------------------------
[SCTP]: Fix getsockname for sctp when an ipv6 socket accepts a connection from
an ipv4 socket.
Signed-off-by: Neil Horman <[EMAIL PROTECTED]>
Signed-off-by: Sridhar Samudrala <[EMAIL PROTECTED]>
---
commit 6f04f31c46e36fd43c9c02b20f044b83295e11e9
tree f39e35a90a8edceddc117a547eef6fb7cef1efe8
parent d4a6393449d96d4e4713896e5de37301f14673f6
author Neil Horman <[EMAIL PROTECTED]> Thu, 01 Dec 2005 16:58:49 -0800
committer Sridhar Samudrala <[EMAIL PROTECTED]> Thu, 01 Dec 2005 16:58:49 -0800
net/sctp/transport.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 6bc2720..268ddaf 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -261,7 +261,8 @@ void sctp_transport_route(struct sctp_tr
* association's active path for getsockname().
*/
if (asoc && (transport == asoc->peer.active_path))
- af->to_sk_saddr(&transport->saddr, asoc->base.sk);
+ opt->pf->af->to_sk_saddr(&transport->saddr,
+ asoc->base.sk);
} else
transport->pmtu = SCTP_DEFAULT_MAXSEGMENT;
}
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
