aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/endpointola.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-02 21:43:40 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-02 22:02:06 -0700
commit7ef527377b88ff05fb122a47619ea506c631c914 (patch)
tree2c2e774527d5f591b975834f43e8c6fd12fb38f2 /net/sctp/endpointola.c
parentnet: Inline skb_pull() in eth_type_trans(). (diff)
parentnet: fix compile error due to double return type in SOCK_DEBUG (diff)
downloadlinux-dev-7ef527377b88ff05fb122a47619ea506c631c914.tar.xz
linux-dev-7ef527377b88ff05fb122a47619ea506c631c914.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sctp/endpointola.c')
-rw-r--r--net/sctp/endpointola.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 905fda582b92..7ec09ba03a1c 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -144,6 +144,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,
/* Use SCTP specific send buffer space queues. */
ep->sndbuf_policy = sctp_sndbuf_policy;
+ sk->sk_data_ready = sctp_data_ready;
sk->sk_write_space = sctp_write_space;
sock_set_flag(sk, SOCK_USE_WRITE_QUEUE);