Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

[NET] RXRPC: 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:14 +09:00 committed by David S. Miller
parent 3dcf7c5e8b
commit 7612713fb6
7 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/rxrpc/connection.c
View File

@ -163,7 +163,7 @@ int rxrpc_create_connection(struct rxrpc_transport *trans,
conn = list_entry(_p, struct rxrpc_connection, link);
if (conn->addr.sin_port == candidate->addr.sin_port &&
conn->security_ix == candidate->security_ix &&
conn->service_id == candidate->service_id &&
conn->service_id == candidate->service_id &&
conn->in_clientflag == 0)
goto found_in_graveyard;
}
@ -247,13 +247,13 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
conn->in_epoch == x_epoch &&
conn->conn_id == x_connid &&
conn->security_ix == x_secix &&
conn->service_id == x_servid &&
conn->service_id == x_servid &&
conn->in_clientflag == x_clflag)
goto found_active;
}
read_unlock(&peer->conn_lock);
/* [uncommon case] not active
/* [uncommon case] not active
* - create a candidate for a new record if an inbound connection
* - only examine the graveyard for an outbound connection
*/
@ -286,7 +286,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
conn->in_epoch == x_epoch &&
conn->conn_id == x_connid &&
conn->security_ix == x_secix &&
conn->service_id == x_servid &&
conn->service_id == x_servid &&
conn->in_clientflag == x_clflag)
goto found_active_second_chance;
}
@ -299,7 +299,7 @@ int rxrpc_connection_lookup(struct rxrpc_peer *peer,
conn->in_epoch == x_epoch &&
conn->conn_id == x_connid &&
conn->security_ix == x_secix &&
conn->service_id == x_servid &&
conn->service_id == x_servid &&
conn->in_clientflag == x_clflag)
goto found_in_graveyard;
}

2
net/rxrpc/internal.h
View File

@ -14,7 +14,7 @@
*/
#if 1
#define __RXACCT_DECL(X) X
#define __RXACCT(X) do { X; } while(0)
#define __RXACCT(X) do { X; } while(0)
#else
#define __RXACCT_DECL(X)
#define __RXACCT(X) do { } while(0)

2
net/rxrpc/krxiod.c
View File

@ -141,7 +141,7 @@ static int rxrpc_krxiod(void *arg)
try_to_freeze();
/* discard pending signals */
/* discard pending signals */
rxrpc_discard_my_signals();
} while (!rxrpc_krxiod_die);

2
net/rxrpc/krxsecd.c
View File

@ -110,7 +110,7 @@ static int rxrpc_krxsecd(void *arg)
try_to_freeze();
/* discard pending signals */
/* discard pending signals */
rxrpc_discard_my_signals();
} while (!die);

44
net/rxrpc/main.c
View File

@ -146,17 +146,17 @@ __attribute__((no_instrument_function));
void __cyg_profile_func_enter (void *this_fn, void *call_site)
{
asm volatile(" movl %%esp,%%edi \n"
" andl %0,%%edi \n"
" addl %1,%%edi \n"
" movl %%esp,%%ecx \n"
" subl %%edi,%%ecx \n"
" shrl $2,%%ecx \n"
" movl $0xedededed,%%eax \n"
" rep stosl \n"
:
: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))
: "eax", "ecx", "edi", "memory", "cc"
);
" andl %0,%%edi \n"
" addl %1,%%edi \n"
" movl %%esp,%%ecx \n"
" subl %%edi,%%ecx \n"
" shrl $2,%%ecx \n"
" movl $0xedededed,%%eax \n"
" rep stosl \n"
:
: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))
: "eax", "ecx", "edi", "memory", "cc"
);
}
void __cyg_profile_func_exit(void *this_fn, void *call_site)
@ -165,16 +165,16 @@ __attribute__((no_instrument_function));
void __cyg_profile_func_exit(void *this_fn, void *call_site)
{
asm volatile(" movl %%esp,%%edi \n"
" andl %0,%%edi \n"
" addl %1,%%edi \n"
" movl %%esp,%%ecx \n"
" subl %%edi,%%ecx \n"
" shrl $2,%%ecx \n"
" movl $0xdadadada,%%eax \n"
" rep stosl \n"
:
: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))
: "eax", "ecx", "edi", "memory", "cc"
);
" andl %0,%%edi \n"
" addl %1,%%edi \n"
" movl %%esp,%%ecx \n"
" subl %%edi,%%ecx \n"
" shrl $2,%%ecx \n"
" movl $0xdadadada,%%eax \n"
" rep stosl \n"
:
: "i"(~(THREAD_SIZE-1)), "i"(sizeof(struct thread_info))
: "eax", "ecx", "edi", "memory", "cc"
);
}
#endif

12
net/rxrpc/sysctl.c
View File

@ -27,7 +27,7 @@ int rxrpc_knet;
static struct ctl_table_header *rxrpc_sysctl = NULL;
static ctl_table rxrpc_sysctl_table[] = {
{
{
.ctl_name = 1,
.procname = "kdebug",
.data = &rxrpc_kdebug,
@ -35,7 +35,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec
},
{
{
.ctl_name = 2,
.procname = "ktrace",
.data = &rxrpc_ktrace,
@ -43,7 +43,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec
},
{
{
.ctl_name = 3,
.procname = "kproto",
.data = &rxrpc_kproto,
@ -51,7 +51,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec
},
{
{
.ctl_name = 4,
.procname = "knet",
.data = &rxrpc_knet,
@ -59,7 +59,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec
},
{
{
.ctl_name = 5,
.procname = "peertimo",
.data = &rxrpc_peer_timeout,
@ -67,7 +67,7 @@ static ctl_table rxrpc_sysctl_table[] = {
.mode = 0644,
.proc_handler = &proc_doulongvec_minmax
},
{
{
.ctl_name = 6,
.procname = "conntimo",
.data = &rxrpc_conn_timeout,

6
net/rxrpc/transport.c
View File

@ -330,10 +330,10 @@ static int rxrpc_incoming_msg(struct rxrpc_transport *trans,
msg->state = RXRPC_MSG_RECEIVED;
skb_get_timestamp(pkt, &msg->stamp);
if (msg->stamp.tv_sec == 0) {
do_gettimeofday(&msg->stamp);
if (pkt->sk)
do_gettimeofday(&msg->stamp);
if (pkt->sk)
sock_enable_timestamp(pkt->sk);
}
}
msg->seq = ntohl(msg->hdr.seq);
/* attach the packet */