Merge branches 'video' and 'video-edid' into release

[karo-tx-linux.git] / net / sctp / endpointola.c

diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index 905fda582b92b652aebd8108feaa12f9cf92fb79..7ec09ba03a1cec9e82d6251d9becccf8a8a42a1b 100644 (file)
--- 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);