diff options
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r-- | net/sctp/socket.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index aafe94bf292e..f09de7fac2e6 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -102,11 +102,6 @@ static int sctp_autobind(struct sock *sk); | |||
102 | static void sctp_sock_migrate(struct sock *, struct sock *, | 102 | static void sctp_sock_migrate(struct sock *, struct sock *, |
103 | struct sctp_association *, sctp_socket_type_t); | 103 | struct sctp_association *, sctp_socket_type_t); |
104 | 104 | ||
105 | extern struct kmem_cache *sctp_bucket_cachep; | ||
106 | extern long sysctl_sctp_mem[3]; | ||
107 | extern int sysctl_sctp_rmem[3]; | ||
108 | extern int sysctl_sctp_wmem[3]; | ||
109 | |||
110 | static int sctp_memory_pressure; | 105 | static int sctp_memory_pressure; |
111 | static atomic_long_t sctp_memory_allocated; | 106 | static atomic_long_t sctp_memory_allocated; |
112 | struct percpu_counter sctp_sockets_allocated; | 107 | struct percpu_counter sctp_sockets_allocated; |
@@ -1586,8 +1581,7 @@ static int sctp_error(struct sock *sk, int flags, int err) | |||
1586 | 1581 | ||
1587 | static int sctp_msghdr_parse(const struct msghdr *, sctp_cmsgs_t *); | 1582 | static int sctp_msghdr_parse(const struct msghdr *, sctp_cmsgs_t *); |
1588 | 1583 | ||
1589 | static int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, | 1584 | static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) |
1590 | struct msghdr *msg, size_t msg_len) | ||
1591 | { | 1585 | { |
1592 | struct net *net = sock_net(sk); | 1586 | struct net *net = sock_net(sk); |
1593 | struct sctp_sock *sp; | 1587 | struct sctp_sock *sp; |
@@ -2066,9 +2060,8 @@ static int sctp_skb_pull(struct sk_buff *skb, int len) | |||
2066 | * flags - flags sent or received with the user message, see Section | 2060 | * flags - flags sent or received with the user message, see Section |
2067 | * 5 for complete description of the flags. | 2061 | * 5 for complete description of the flags. |
2068 | */ | 2062 | */ |
2069 | static int sctp_recvmsg(struct kiocb *iocb, struct sock *sk, | 2063 | static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, |
2070 | struct msghdr *msg, size_t len, int noblock, | 2064 | int noblock, int flags, int *addr_len) |
2071 | int flags, int *addr_len) | ||
2072 | { | 2065 | { |
2073 | struct sctp_ulpevent *event = NULL; | 2066 | struct sctp_ulpevent *event = NULL; |
2074 | struct sctp_sock *sp = sctp_sk(sk); | 2067 | struct sctp_sock *sp = sctp_sk(sk); |