mirror of
https://github.com/fail0verflow/switch-linux.git
synced 2025-05-04 02:34:21 -04:00
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>
This commit is contained in:
parent
cb3f837ba9
commit
26ac8e5fe1
8 changed files with 22 additions and 22 deletions
|
@ -226,9 +226,9 @@ static struct sctp_auth_bytes *sctp_auth_make_local_vector(
|
||||||
gfp_t gfp)
|
gfp_t gfp)
|
||||||
{
|
{
|
||||||
return sctp_auth_make_key_vector(
|
return sctp_auth_make_key_vector(
|
||||||
(sctp_random_param_t*)asoc->c.auth_random,
|
(sctp_random_param_t *)asoc->c.auth_random,
|
||||||
(sctp_chunks_param_t*)asoc->c.auth_chunks,
|
(sctp_chunks_param_t *)asoc->c.auth_chunks,
|
||||||
(sctp_hmac_algo_param_t*)asoc->c.auth_hmacs,
|
(sctp_hmac_algo_param_t *)asoc->c.auth_hmacs,
|
||||||
gfp);
|
gfp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ static void sctp_objcnt_seq_stop(struct seq_file *seq, void *v)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
static void * sctp_objcnt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
static void *sctp_objcnt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
||||||
{
|
{
|
||||||
++*pos;
|
++*pos;
|
||||||
return (*pos >= ARRAY_SIZE(sctp_dbg_objcnt)) ? NULL : (void *)pos;
|
return (*pos >= ARRAY_SIZE(sctp_dbg_objcnt)) ? NULL : (void *)pos;
|
||||||
|
|
|
@ -177,7 +177,7 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
|
static void *sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
|
||||||
{
|
{
|
||||||
if (*pos >= sctp_ep_hashsize)
|
if (*pos >= sctp_ep_hashsize)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -196,7 +196,7 @@ static void sctp_eps_seq_stop(struct seq_file *seq, void *v)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void * sctp_eps_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
static void *sctp_eps_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
||||||
{
|
{
|
||||||
if (++*pos >= sctp_ep_hashsize)
|
if (++*pos >= sctp_ep_hashsize)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -282,7 +282,7 @@ void sctp_eps_proc_exit(struct net *net)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void * sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos)
|
static void *sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos)
|
||||||
{
|
{
|
||||||
if (*pos >= sctp_assoc_hashsize)
|
if (*pos >= sctp_assoc_hashsize)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -305,7 +305,7 @@ static void sctp_assocs_seq_stop(struct seq_file *seq, void *v)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void * sctp_assocs_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
static void *sctp_assocs_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
||||||
{
|
{
|
||||||
if (++*pos >= sctp_assoc_hashsize)
|
if (++*pos >= sctp_assoc_hashsize)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -2251,7 +2251,7 @@ int sctp_verify_init(struct net *net, const struct sctp_association *asoc,
|
||||||
* VIOLATION error. We build the ERROR chunk here and let the normal
|
* VIOLATION error. We build the ERROR chunk here and let the normal
|
||||||
* error handling code build and send the packet.
|
* error handling code build and send the packet.
|
||||||
*/
|
*/
|
||||||
if (param.v != (void*)chunk->chunk_end)
|
if (param.v != (void *)chunk->chunk_end)
|
||||||
return sctp_process_inv_paramlength(asoc, param.p, chunk, errp);
|
return sctp_process_inv_paramlength(asoc, param.p, chunk, errp);
|
||||||
|
|
||||||
/* The only missing mandatory param possible today is
|
/* The only missing mandatory param possible today is
|
||||||
|
|
|
@ -4610,7 +4610,7 @@ sctp_disposition_t sctp_sf_do_prm_asoc(struct net *net,
|
||||||
sctp_cmd_seq_t *commands)
|
sctp_cmd_seq_t *commands)
|
||||||
{
|
{
|
||||||
struct sctp_chunk *repl;
|
struct sctp_chunk *repl;
|
||||||
struct sctp_association* my_asoc;
|
struct sctp_association *my_asoc;
|
||||||
|
|
||||||
/* The comment below says that we enter COOKIE-WAIT AFTER
|
/* The comment below says that we enter COOKIE-WAIT AFTER
|
||||||
* sending the INIT, but that doesn't actually work in our
|
* sending the INIT, but that doesn't actually work in our
|
||||||
|
|
|
@ -82,7 +82,7 @@ static int sctp_writeable(struct sock *sk);
|
||||||
static void sctp_wfree(struct sk_buff *skb);
|
static void sctp_wfree(struct sk_buff *skb);
|
||||||
static int sctp_wait_for_sndbuf(struct sctp_association *, long *timeo_p,
|
static int sctp_wait_for_sndbuf(struct sctp_association *, long *timeo_p,
|
||||||
size_t msg_len);
|
size_t msg_len);
|
||||||
static int sctp_wait_for_packet(struct sock * sk, int *err, long *timeo_p);
|
static int sctp_wait_for_packet(struct sock *sk, int *err, long *timeo_p);
|
||||||
static int sctp_wait_for_connect(struct sctp_association *, long *timeo_p);
|
static int sctp_wait_for_connect(struct sctp_association *, long *timeo_p);
|
||||||
static int sctp_wait_for_accept(struct sock *sk, long timeo);
|
static int sctp_wait_for_accept(struct sock *sk, long timeo);
|
||||||
static void sctp_wait_for_close(struct sock *sk, long timeo);
|
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)
|
||||||
*
|
*
|
||||||
* Returns 0 if ok, <0 errno code on error.
|
* Returns 0 if ok, <0 errno code on error.
|
||||||
*/
|
*/
|
||||||
static int sctp_setsockopt_bindx(struct sock* sk,
|
static int sctp_setsockopt_bindx(struct sock *sk,
|
||||||
struct sockaddr __user *addrs,
|
struct sockaddr __user *addrs,
|
||||||
int addrs_size, int op)
|
int addrs_size, int op)
|
||||||
{
|
{
|
||||||
|
@ -1039,7 +1039,7 @@ out:
|
||||||
* Common routine for handling connect() and sctp_connectx().
|
* Common routine for handling connect() and sctp_connectx().
|
||||||
* Connect will come in with just a single address.
|
* Connect will come in with just a single address.
|
||||||
*/
|
*/
|
||||||
static int __sctp_connect(struct sock* sk,
|
static int __sctp_connect(struct sock *sk,
|
||||||
struct sockaddr *kaddrs,
|
struct sockaddr *kaddrs,
|
||||||
int addrs_size,
|
int addrs_size,
|
||||||
sctp_assoc_t *assoc_id)
|
sctp_assoc_t *assoc_id)
|
||||||
|
@ -1299,7 +1299,7 @@ out_free:
|
||||||
*
|
*
|
||||||
* Returns >=0 if ok, <0 errno code on error.
|
* Returns >=0 if ok, <0 errno code on error.
|
||||||
*/
|
*/
|
||||||
static int __sctp_setsockopt_connectx(struct sock* sk,
|
static int __sctp_setsockopt_connectx(struct sock *sk,
|
||||||
struct sockaddr __user *addrs,
|
struct sockaddr __user *addrs,
|
||||||
int addrs_size,
|
int addrs_size,
|
||||||
sctp_assoc_t *assoc_id)
|
sctp_assoc_t *assoc_id)
|
||||||
|
@ -1337,7 +1337,7 @@ static int __sctp_setsockopt_connectx(struct sock* sk,
|
||||||
* This is an older interface. It's kept for backward compatibility
|
* This is an older interface. It's kept for backward compatibility
|
||||||
* to the option that doesn't provide association id.
|
* to the option that doesn't provide association id.
|
||||||
*/
|
*/
|
||||||
static int sctp_setsockopt_connectx_old(struct sock* sk,
|
static int sctp_setsockopt_connectx_old(struct sock *sk,
|
||||||
struct sockaddr __user *addrs,
|
struct sockaddr __user *addrs,
|
||||||
int addrs_size)
|
int addrs_size)
|
||||||
{
|
{
|
||||||
|
@ -1350,7 +1350,7 @@ static int sctp_setsockopt_connectx_old(struct sock* sk,
|
||||||
* indication to the call. Error is always negative and association id is
|
* indication to the call. Error is always negative and association id is
|
||||||
* always positive.
|
* always positive.
|
||||||
*/
|
*/
|
||||||
static int sctp_setsockopt_connectx(struct sock* sk,
|
static int sctp_setsockopt_connectx(struct sock *sk,
|
||||||
struct sockaddr __user *addrs,
|
struct sockaddr __user *addrs,
|
||||||
int addrs_size)
|
int addrs_size)
|
||||||
{
|
{
|
||||||
|
@ -1373,7 +1373,7 @@ static int sctp_setsockopt_connectx(struct sock* sk,
|
||||||
* addrs_num structure member. That way we can re-use the existing
|
* addrs_num structure member. That way we can re-use the existing
|
||||||
* code.
|
* code.
|
||||||
*/
|
*/
|
||||||
static int sctp_getsockopt_connectx3(struct sock* sk, int len,
|
static int sctp_getsockopt_connectx3(struct sock *sk, int len,
|
||||||
char __user *optval,
|
char __user *optval,
|
||||||
int __user *optlen)
|
int __user *optlen)
|
||||||
{
|
{
|
||||||
|
@ -5475,7 +5475,7 @@ static int sctp_getsockopt_local_auth_chunks(struct sock *sk, int len,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (asoc)
|
if (asoc)
|
||||||
ch = (struct sctp_chunks_param*)asoc->c.auth_chunks;
|
ch = (struct sctp_chunks_param *)asoc->c.auth_chunks;
|
||||||
else
|
else
|
||||||
ch = sctp_sk(sk)->ep->auth_chunk_list;
|
ch = sctp_sk(sk)->ep->auth_chunk_list;
|
||||||
|
|
||||||
|
@ -6417,7 +6417,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
|
||||||
* Note: This function is the same function as in core/datagram.c
|
* Note: This function is the same function as in core/datagram.c
|
||||||
* with a few modifications to make lksctp work.
|
* with a few modifications to make lksctp work.
|
||||||
*/
|
*/
|
||||||
static int sctp_wait_for_packet(struct sock * sk, int *err, long *timeo_p)
|
static int sctp_wait_for_packet(struct sock *sk, int *err, long *timeo_p)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
DEFINE_WAIT(wait);
|
DEFINE_WAIT(wait);
|
||||||
|
|
|
@ -424,7 +424,7 @@ void sctp_sysctl_net_unregister(struct net *net)
|
||||||
kfree(table);
|
kfree(table);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct ctl_table_header * sctp_sysctl_header;
|
static struct ctl_table_header *sctp_sysctl_header;
|
||||||
|
|
||||||
/* Sysctl registration. */
|
/* Sysctl registration. */
|
||||||
void sctp_sysctl_register(void)
|
void sctp_sysctl_register(void)
|
||||||
|
|
|
@ -43,9 +43,9 @@
|
||||||
#include <net/sctp/sm.h>
|
#include <net/sctp/sm.h>
|
||||||
|
|
||||||
/* Forward declarations for internal helpers. */
|
/* Forward declarations for internal helpers. */
|
||||||
static struct sctp_ulpevent * sctp_ulpq_reasm(struct sctp_ulpq *ulpq,
|
static struct sctp_ulpevent *sctp_ulpq_reasm(struct sctp_ulpq *ulpq,
|
||||||
struct sctp_ulpevent *);
|
struct sctp_ulpevent *);
|
||||||
static struct sctp_ulpevent * sctp_ulpq_order(struct sctp_ulpq *,
|
static struct sctp_ulpevent *sctp_ulpq_order(struct sctp_ulpq *,
|
||||||
struct sctp_ulpevent *);
|
struct sctp_ulpevent *);
|
||||||
static void sctp_ulpq_reasm_drain(struct sctp_ulpq *ulpq);
|
static void sctp_ulpq_reasm_drain(struct sctp_ulpq *ulpq);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue