aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwangweidong <wangweidong1@huawei.com>2013-12-22 23:16:51 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-26 13:47:47 -0500
commit26ac8e5fe1562831e68ccd9f7057aade37aab2a3 (patch)
treeb794c102b9c92d6a7433af238d4332ea6424a893 /net
parentcb3f837ba95d7774978e86fc17ddf970cf7d15a4 (diff)
sctp: fix checkpatch errors with (foo*)|foo * bar|foo* bar
fix checkpatch errors below: ERROR: "(foo*)" should be "(foo *)" ERROR: "foo * bar" should be "foo *bar" ERROR: "foo* bar" should be "foo *bar" Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/auth.c6
-rw-r--r--net/sctp/objcnt.c2
-rw-r--r--net/sctp/proc.c8
-rw-r--r--net/sctp/sm_make_chunk.c2
-rw-r--r--net/sctp/sm_statefuns.c2
-rw-r--r--net/sctp/socket.c18
-rw-r--r--net/sctp/sysctl.c2
-rw-r--r--net/sctp/ulpqueue.c4
8 files changed, 22 insertions, 22 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 78767aa20435..889400bbf411 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -226,9 +226,9 @@ static struct sctp_auth_bytes *sctp_auth_make_local_vector(
226 gfp_t gfp) 226 gfp_t gfp)
227{ 227{
228 return sctp_auth_make_key_vector( 228 return sctp_auth_make_key_vector(
229 (sctp_random_param_t*)asoc->c.auth_random, 229 (sctp_random_param_t *)asoc->c.auth_random,
230 (sctp_chunks_param_t*)asoc->c.auth_chunks, 230 (sctp_chunks_param_t *)asoc->c.auth_chunks,
231 (sctp_hmac_algo_param_t*)asoc->c.auth_hmacs, 231 (sctp_hmac_algo_param_t *)asoc->c.auth_hmacs,
232 gfp); 232 gfp);
233} 233}
234 234
diff --git a/net/sctp/objcnt.c b/net/sctp/objcnt.c
index 0c28e8a55324..40e7fac96c41 100644
--- a/net/sctp/objcnt.c
+++ b/net/sctp/objcnt.c
@@ -97,7 +97,7 @@ static void sctp_objcnt_seq_stop(struct seq_file *seq, void *v)
97{ 97{
98} 98}
99 99
100static void * sctp_objcnt_seq_next(struct seq_file *seq, void *v, loff_t *pos) 100static void *sctp_objcnt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
101{ 101{
102 ++*pos; 102 ++*pos;
103 return (*pos >= ARRAY_SIZE(sctp_dbg_objcnt)) ? NULL : (void *)pos; 103 return (*pos >= ARRAY_SIZE(sctp_dbg_objcnt)) ? NULL : (void *)pos;
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index de32e14f7398..63ba0bdc867a 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -177,7 +177,7 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
177 rcu_read_unlock(); 177 rcu_read_unlock();
178} 178}
179 179
180static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos) 180static void *sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
181{ 181{
182 if (*pos >= sctp_ep_hashsize) 182 if (*pos >= sctp_ep_hashsize)
183 return NULL; 183 return NULL;
@@ -196,7 +196,7 @@ static void sctp_eps_seq_stop(struct seq_file *seq, void *v)
196} 196}
197 197
198 198
199static void * sctp_eps_seq_next(struct seq_file *seq, void *v, loff_t *pos) 199static void *sctp_eps_seq_next(struct seq_file *seq, void *v, loff_t *pos)
200{ 200{
201 if (++*pos >= sctp_ep_hashsize) 201 if (++*pos >= sctp_ep_hashsize)
202 return NULL; 202 return NULL;
@@ -282,7 +282,7 @@ void sctp_eps_proc_exit(struct net *net)
282} 282}
283 283
284 284
285static void * sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos) 285static void *sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos)
286{ 286{
287 if (*pos >= sctp_assoc_hashsize) 287 if (*pos >= sctp_assoc_hashsize)
288 return NULL; 288 return NULL;
@@ -305,7 +305,7 @@ static void sctp_assocs_seq_stop(struct seq_file *seq, void *v)
305} 305}
306 306
307 307
308static void * sctp_assocs_seq_next(struct seq_file *seq, void *v, loff_t *pos) 308static void *sctp_assocs_seq_next(struct seq_file *seq, void *v, loff_t *pos)
309{ 309{
310 if (++*pos >= sctp_assoc_hashsize) 310 if (++*pos >= sctp_assoc_hashsize)
311 return NULL; 311 return NULL;
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 439d87206820..d53af47efa7d 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -2251,7 +2251,7 @@ int sctp_verify_init(struct net *net, const struct sctp_association *asoc,
2251 * VIOLATION error. We build the ERROR chunk here and let the normal 2251 * VIOLATION error. We build the ERROR chunk here and let the normal
2252 * error handling code build and send the packet. 2252 * error handling code build and send the packet.
2253 */ 2253 */
2254 if (param.v != (void*)chunk->chunk_end) 2254 if (param.v != (void *)chunk->chunk_end)
2255 return sctp_process_inv_paramlength(asoc, param.p, chunk, errp); 2255 return sctp_process_inv_paramlength(asoc, param.p, chunk, errp);
2256 2256
2257 /* The only missing mandatory param possible today is 2257 /* The only missing mandatory param possible today is
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index bc690b4b4971..624e4ef9f073 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -4610,7 +4610,7 @@ sctp_disposition_t sctp_sf_do_prm_asoc(struct net *net,
4610 sctp_cmd_seq_t *commands) 4610 sctp_cmd_seq_t *commands)
4611{ 4611{
4612 struct sctp_chunk *repl; 4612 struct sctp_chunk *repl;
4613 struct sctp_association* my_asoc; 4613 struct sctp_association *my_asoc;
4614 4614
4615 /* The comment below says that we enter COOKIE-WAIT AFTER 4615 /* The comment below says that we enter COOKIE-WAIT AFTER
4616 * sending the INIT, but that doesn't actually work in our 4616 * sending the INIT, but that doesn't actually work in our
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);
82static void sctp_wfree(struct sk_buff *skb); 82static void sctp_wfree(struct sk_buff *skb);
83static int sctp_wait_for_sndbuf(struct sctp_association *, long *timeo_p, 83static int sctp_wait_for_sndbuf(struct sctp_association *, long *timeo_p,
84 size_t msg_len); 84 size_t msg_len);
85static int sctp_wait_for_packet(struct sock * sk, int *err, long *timeo_p); 85static int sctp_wait_for_packet(struct sock *sk, int *err, long *timeo_p);
86static int sctp_wait_for_connect(struct sctp_association *, long *timeo_p); 86static int sctp_wait_for_connect(struct sctp_association *, long *timeo_p);
87static int sctp_wait_for_accept(struct sock *sk, long timeo); 87static int sctp_wait_for_accept(struct sock *sk, long timeo);
88static void sctp_wait_for_close(struct sock *sk, long timeo); 88static 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 */
955static int sctp_setsockopt_bindx(struct sock* sk, 955static 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 */
1042static int __sctp_connect(struct sock* sk, 1042static 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 */
1302static int __sctp_setsockopt_connectx(struct sock* sk, 1302static 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 */
1340static int sctp_setsockopt_connectx_old(struct sock* sk, 1340static 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 */
1353static int sctp_setsockopt_connectx(struct sock* sk, 1353static 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 */
1376static int sctp_getsockopt_connectx3(struct sock* sk, int len, 1376static 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 */
6420static int sctp_wait_for_packet(struct sock * sk, int *err, long *timeo_p) 6420static 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);
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index 9dd5ac084663..7135e617ab0f 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -424,7 +424,7 @@ void sctp_sysctl_net_unregister(struct net *net)
424 kfree(table); 424 kfree(table);
425} 425}
426 426
427static struct ctl_table_header * sctp_sysctl_header; 427static struct ctl_table_header *sctp_sysctl_header;
428 428
429/* Sysctl registration. */ 429/* Sysctl registration. */
430void sctp_sysctl_register(void) 430void sctp_sysctl_register(void)
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index 2d96640b7ad8..c700369d11f7 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -43,9 +43,9 @@
43#include <net/sctp/sm.h> 43#include <net/sctp/sm.h>
44 44
45/* Forward declarations for internal helpers. */ 45/* Forward declarations for internal helpers. */
46static struct sctp_ulpevent * sctp_ulpq_reasm(struct sctp_ulpq *ulpq, 46static struct sctp_ulpevent *sctp_ulpq_reasm(struct sctp_ulpq *ulpq,
47 struct sctp_ulpevent *); 47 struct sctp_ulpevent *);
48static struct sctp_ulpevent * sctp_ulpq_order(struct sctp_ulpq *, 48static struct sctp_ulpevent *sctp_ulpq_order(struct sctp_ulpq *,
49 struct sctp_ulpevent *); 49 struct sctp_ulpevent *);
50static void sctp_ulpq_reasm_drain(struct sctp_ulpq *ulpq); 50static void sctp_ulpq_reasm_drain(struct sctp_ulpq *ulpq);
51 51