diff options
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r-- | net/sctp/socket.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 500972a9647e..9f42c605bfa8 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -82,7 +82,7 @@ static int sctp_writeable(struct sock *sk); | |||
82 | static void sctp_wfree(struct sk_buff *skb); | 82 | static void sctp_wfree(struct sk_buff *skb); |
83 | static int sctp_wait_for_sndbuf(struct sctp_association *, long *timeo_p, | 83 | static int sctp_wait_for_sndbuf(struct sctp_association *, long *timeo_p, |
84 | size_t msg_len); | 84 | size_t msg_len); |
85 | static int sctp_wait_for_packet(struct sock * sk, int *err, long *timeo_p); | 85 | static int sctp_wait_for_packet(struct sock *sk, int *err, long *timeo_p); |
86 | static int sctp_wait_for_connect(struct sctp_association *, long *timeo_p); | 86 | static int sctp_wait_for_connect(struct sctp_association *, long *timeo_p); |
87 | static int sctp_wait_for_accept(struct sock *sk, long timeo); | 87 | static int sctp_wait_for_accept(struct sock *sk, long timeo); |
88 | static void sctp_wait_for_close(struct sock *sk, long timeo); | 88 | static void sctp_wait_for_close(struct sock *sk, long timeo); |
@@ -952,7 +952,7 @@ int sctp_asconf_mgmt(struct sctp_sock *sp, struct sctp_sockaddr_entry *addrw) | |||
952 | * | 952 | * |
953 | * Returns 0 if ok, <0 errno code on error. | 953 | * Returns 0 if ok, <0 errno code on error. |
954 | */ | 954 | */ |
955 | static int sctp_setsockopt_bindx(struct sock* sk, | 955 | static int sctp_setsockopt_bindx(struct sock *sk, |
956 | struct sockaddr __user *addrs, | 956 | struct sockaddr __user *addrs, |
957 | int addrs_size, int op) | 957 | int addrs_size, int op) |
958 | { | 958 | { |
@@ -1039,7 +1039,7 @@ out: | |||
1039 | * Common routine for handling connect() and sctp_connectx(). | 1039 | * Common routine for handling connect() and sctp_connectx(). |
1040 | * Connect will come in with just a single address. | 1040 | * Connect will come in with just a single address. |
1041 | */ | 1041 | */ |
1042 | static int __sctp_connect(struct sock* sk, | 1042 | static int __sctp_connect(struct sock *sk, |
1043 | struct sockaddr *kaddrs, | 1043 | struct sockaddr *kaddrs, |
1044 | int addrs_size, | 1044 | int addrs_size, |
1045 | sctp_assoc_t *assoc_id) | 1045 | sctp_assoc_t *assoc_id) |
@@ -1299,7 +1299,7 @@ out_free: | |||
1299 | * | 1299 | * |
1300 | * Returns >=0 if ok, <0 errno code on error. | 1300 | * Returns >=0 if ok, <0 errno code on error. |
1301 | */ | 1301 | */ |
1302 | static int __sctp_setsockopt_connectx(struct sock* sk, | 1302 | static int __sctp_setsockopt_connectx(struct sock *sk, |
1303 | struct sockaddr __user *addrs, | 1303 | struct sockaddr __user *addrs, |
1304 | int addrs_size, | 1304 | int addrs_size, |
1305 | sctp_assoc_t *assoc_id) | 1305 | sctp_assoc_t *assoc_id) |
@@ -1337,7 +1337,7 @@ static int __sctp_setsockopt_connectx(struct sock* sk, | |||
1337 | * This is an older interface. It's kept for backward compatibility | 1337 | * This is an older interface. It's kept for backward compatibility |
1338 | * to the option that doesn't provide association id. | 1338 | * to the option that doesn't provide association id. |
1339 | */ | 1339 | */ |
1340 | static int sctp_setsockopt_connectx_old(struct sock* sk, | 1340 | static int sctp_setsockopt_connectx_old(struct sock *sk, |
1341 | struct sockaddr __user *addrs, | 1341 | struct sockaddr __user *addrs, |
1342 | int addrs_size) | 1342 | int addrs_size) |
1343 | { | 1343 | { |
@@ -1350,7 +1350,7 @@ static int sctp_setsockopt_connectx_old(struct sock* sk, | |||
1350 | * indication to the call. Error is always negative and association id is | 1350 | * indication to the call. Error is always negative and association id is |
1351 | * always positive. | 1351 | * always positive. |
1352 | */ | 1352 | */ |
1353 | static int sctp_setsockopt_connectx(struct sock* sk, | 1353 | static int sctp_setsockopt_connectx(struct sock *sk, |
1354 | struct sockaddr __user *addrs, | 1354 | struct sockaddr __user *addrs, |
1355 | int addrs_size) | 1355 | int addrs_size) |
1356 | { | 1356 | { |
@@ -1373,7 +1373,7 @@ static int sctp_setsockopt_connectx(struct sock* sk, | |||
1373 | * addrs_num structure member. That way we can re-use the existing | 1373 | * addrs_num structure member. That way we can re-use the existing |
1374 | * code. | 1374 | * code. |
1375 | */ | 1375 | */ |
1376 | static int sctp_getsockopt_connectx3(struct sock* sk, int len, | 1376 | static int sctp_getsockopt_connectx3(struct sock *sk, int len, |
1377 | char __user *optval, | 1377 | char __user *optval, |
1378 | int __user *optlen) | 1378 | int __user *optlen) |
1379 | { | 1379 | { |
@@ -5475,7 +5475,7 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len, | |||
5475 | return -EINVAL; | 5475 | return -EINVAL; |
5476 | 5476 | ||
5477 | if (asoc) | 5477 | if (asoc) |
5478 | ch = (struct sctp_chunks_param*)asoc->c.auth_chunks; | 5478 | ch = (struct sctp_chunks_param *)asoc->c.auth_chunks; |
5479 | else | 5479 | else |
5480 | ch = sctp_sk(sk)->ep->auth_chunk_list; | 5480 | ch = sctp_sk(sk)->ep->auth_chunk_list; |
5481 | 5481 | ||
@@ -6417,7 +6417,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs) | |||
6417 | * Note: This function is the same function as in core/datagram.c | 6417 | * Note: This function is the same function as in core/datagram.c |
6418 | * with a few modifications to make lksctp work. | 6418 | * with a few modifications to make lksctp work. |
6419 | */ | 6419 | */ |
6420 | static int sctp_wait_for_packet(struct sock * sk, int *err, long *timeo_p) | 6420 | static int sctp_wait_for_packet(struct sock *sk, int *err, long *timeo_p) |
6421 | { | 6421 | { |
6422 | int error; | 6422 | int error; |
6423 | DEFINE_WAIT(wait); | 6423 | DEFINE_WAIT(wait); |