OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NET] X25: Fix whitespace errors. 

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2007-02-09 23:25:27 +09:00 committed by David S. Miller
parent 4ba6122b4e
commit f8e1d20183
10 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
net/x25/af_x25.c
View File

@ -256,8 +256,8 @@ static struct sock *x25_find_listener(struct x25_address *addr,
* call user data vs this sockets call user data * call user data vs this sockets call user data
*/ */
if(skb->len > 0 && x25_sk(s)->cudmatchlength > 0) { if(skb->len > 0 && x25_sk(s)->cudmatchlength > 0) {
if((memcmp(x25_sk(s)->calluserdata.cuddata, if((memcmp(x25_sk(s)->calluserdata.cuddata,
skb->data, skb->data,
x25_sk(s)->cudmatchlength)) == 0) { x25_sk(s)->cudmatchlength)) == 0) {
sock_hold(s); sock_hold(s);
goto found; goto found;
@ -523,12 +523,12 @@ static int x25_create(struct socket *sock, int protocol)
x25->facilities.pacsize_out = X25_DEFAULT_PACKET_SIZE; x25->facilities.pacsize_out = X25_DEFAULT_PACKET_SIZE;
x25->facilities.throughput = X25_DEFAULT_THROUGHPUT; x25->facilities.throughput = X25_DEFAULT_THROUGHPUT;
x25->facilities.reverse = X25_DEFAULT_REVERSE; x25->facilities.reverse = X25_DEFAULT_REVERSE;
x25->dte_facilities.calling_len = 0; x25->dte_facilities.calling_len = 0;
x25->dte_facilities.called_len = 0; x25->dte_facilities.called_len = 0;
memset(x25->dte_facilities.called_ae, '\0', memset(x25->dte_facilities.called_ae, '\0',
sizeof(x25->dte_facilities.called_ae)); sizeof(x25->dte_facilities.called_ae));
memset(x25->dte_facilities.calling_ae, '\0', memset(x25->dte_facilities.calling_ae, '\0',
sizeof(x25->dte_facilities.calling_ae)); sizeof(x25->dte_facilities.calling_ae));
rc = 0; rc = 0;
out: out:
@ -635,7 +635,7 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
static int x25_wait_for_connection_establishment(struct sock *sk) static int x25_wait_for_connection_establishment(struct sock *sk)
{ {
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
int rc; int rc;
add_wait_queue_exclusive(sk->sk_sleep, &wait); add_wait_queue_exclusive(sk->sk_sleep, &wait);
for (;;) { for (;;) {
@ -1120,7 +1120,7 @@ static int x25_sendmsg(struct kiocb *iocb, struct socket *sock,
if (msg->msg_flags & MSG_OOB) if (msg->msg_flags & MSG_OOB)
skb_queue_tail(&x25->interrupt_out_queue, skb); skb_queue_tail(&x25->interrupt_out_queue, skb);
else { else {
len = x25_output(sk, skb); len = x25_output(sk, skb);
if (len < 0) if (len < 0)
kfree_skb(skb); kfree_skb(skb);
else if (x25->qbitincl) else if (x25->qbitincl)
@ -1346,17 +1346,17 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
} }
case SIOCX25GDTEFACILITIES: { case SIOCX25GDTEFACILITIES: {
rc = copy_to_user(argp, &x25->dte_facilities, rc = copy_to_user(argp, &x25->dte_facilities,
sizeof(x25->dte_facilities)); sizeof(x25->dte_facilities));
if (rc) if (rc)
rc = -EFAULT; rc = -EFAULT;
break; break;
} }
case SIOCX25SDTEFACILITIES: { case SIOCX25SDTEFACILITIES: {
struct x25_dte_facilities dtefacs; struct x25_dte_facilities dtefacs;
rc = -EFAULT; rc = -EFAULT;
if (copy_from_user(&dtefacs, argp, sizeof(dtefacs))) if (copy_from_user(&dtefacs, argp, sizeof(dtefacs)))
break; break;
rc = -EINVAL; rc = -EINVAL;
if (sk->sk_state != TCP_LISTEN && if (sk->sk_state != TCP_LISTEN &&
@ -1414,7 +1414,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
if (copy_from_user(&sub_addr, argp, if (copy_from_user(&sub_addr, argp,
sizeof(sub_addr))) sizeof(sub_addr)))
break; break;
rc = -EINVAL; rc = -EINVAL;
if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN) if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN)
break; break;
x25->cudmatchlength = sub_addr.cudmatchlength; x25->cudmatchlength = sub_addr.cudmatchlength;
@ -1443,7 +1443,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
break; break;
} }
default: default:
rc = -ENOIOCTLCMD; rc = -ENOIOCTLCMD;
break; break;
} }

10
net/x25/sysctl_net_x25.c
View File

@ -18,7 +18,7 @@ static int max_timer[] = { 300 * HZ };
static struct ctl_table_header *x25_table_header; static struct ctl_table_header *x25_table_header;
static struct ctl_table x25_table[] = { static struct ctl_table x25_table[] = {
{ {
.ctl_name = NET_X25_RESTART_REQUEST_TIMEOUT, .ctl_name = NET_X25_RESTART_REQUEST_TIMEOUT,
.procname = "restart_request_timeout", .procname = "restart_request_timeout",
.data = &sysctl_x25_restart_request_timeout, .data = &sysctl_x25_restart_request_timeout,
@ -29,7 +29,7 @@ static struct ctl_table x25_table[] = {
.extra1 = &min_timer, .extra1 = &min_timer,
.extra2 = &max_timer, .extra2 = &max_timer,
}, },
{ {
.ctl_name = NET_X25_CALL_REQUEST_TIMEOUT, .ctl_name = NET_X25_CALL_REQUEST_TIMEOUT,
.procname = "call_request_timeout", .procname = "call_request_timeout",
.data = &sysctl_x25_call_request_timeout, .data = &sysctl_x25_call_request_timeout,
@ -40,7 +40,7 @@ static struct ctl_table x25_table[] = {
.extra1 = &min_timer, .extra1 = &min_timer,
.extra2 = &max_timer, .extra2 = &max_timer,
}, },
{ {
.ctl_name = NET_X25_RESET_REQUEST_TIMEOUT, .ctl_name = NET_X25_RESET_REQUEST_TIMEOUT,
.procname = "reset_request_timeout", .procname = "reset_request_timeout",
.data = &sysctl_x25_reset_request_timeout, .data = &sysctl_x25_reset_request_timeout,
@ -51,7 +51,7 @@ static struct ctl_table x25_table[] = {
.extra1 = &min_timer, .extra1 = &min_timer,
.extra2 = &max_timer, .extra2 = &max_timer,
}, },
{ {
.ctl_name = NET_X25_CLEAR_REQUEST_TIMEOUT, .ctl_name = NET_X25_CLEAR_REQUEST_TIMEOUT,
.procname = "clear_request_timeout", .procname = "clear_request_timeout",
.data = &sysctl_x25_clear_request_timeout, .data = &sysctl_x25_clear_request_timeout,
@ -62,7 +62,7 @@ static struct ctl_table x25_table[] = {
.extra1 = &min_timer, .extra1 = &min_timer,
.extra2 = &max_timer, .extra2 = &max_timer,
}, },
{ {
.ctl_name = NET_X25_ACK_HOLD_BACK_TIMEOUT, .ctl_name = NET_X25_ACK_HOLD_BACK_TIMEOUT,
.procname = "acknowledgement_hold_back_timeout", .procname = "acknowledgement_hold_back_timeout",
.data = &sysctl_x25_ack_holdback_timeout, .data = &sysctl_x25_ack_holdback_timeout,

2
net/x25/x25_dev.c
View File

@ -31,7 +31,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
unsigned int lci; unsigned int lci;
frametype = skb->data[2]; frametype = skb->data[2];
lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF); lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF);
/* /*
* LCI of zero is always for us, and its always a link control * LCI of zero is always for us, and its always a link control

4
net/x25/x25_facilities.c
View File

@ -125,8 +125,8 @@ int x25_parse_facilities(struct sk_buff *skb, struct x25_facilities *facilities,
break; break;
case X25_FAC_CLASS_D: case X25_FAC_CLASS_D:
switch (*p) { switch (*p) {
case X25_FAC_CALLING_AE: case X25_FAC_CALLING_AE:
if (p[1] > X25_MAX_DTE_FACIL_LEN) if (p[1] > X25_MAX_DTE_FACIL_LEN)
break; break;
dte_facs->calling_len = p[2]; dte_facs->calling_len = p[2];
memcpy(dte_facs->calling_ae, &p[3], p[1] - 1); memcpy(dte_facs->calling_ae, &p[3], p[1] - 1);

4
net/x25/x25_timer.c
View File

@ -99,8 +99,8 @@ static void x25_heartbeat_expiry(unsigned long param)
{ {
struct sock *sk = (struct sock *)param; struct sock *sk = (struct sock *)param;
bh_lock_sock(sk); bh_lock_sock(sk);
if (sock_owned_by_user(sk)) /* can currently only occur in state 3 */ if (sock_owned_by_user(sk)) /* can currently only occur in state 3 */
goto restart_heartbeat; goto restart_heartbeat;
switch (x25_sk(sk)->state) { switch (x25_sk(sk)->state) {