summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/rxrpc/connection.c10
-rw-r--r--net/rxrpc/internal.h2
-rw-r--r--net/rxrpc/krxiod.c2
-rw-r--r--net/rxrpc/krxsecd.c2
-rw-r--r--net/rxrpc/main.c44
-rw-r--r--net/rxrpc/sysctl.c12
-rw-r--r--net/rxrpc/transport.c6
7 files changed, 39 insertions, 39 deletions
diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c
index 93d2c55ad2d..a7c929a9fdc 100644
--- a/net/rxrpc/connection.c
+++ b/net/rxrpc/connection.c
@@ -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;
}
diff --git a/net/rxrpc/internal.h b/net/rxrpc/internal.h
index 70e52f6b0b6..cc0c5795a10 100644
--- a/net/rxrpc/internal.h
+++ b/net/rxrpc/internal.h
@@ -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)
diff --git a/net/rxrpc/krxiod.c b/net/rxrpc/krxiod.c
index 49effd92144..bbbcd6c2404 100644
--- a/net/rxrpc/krxiod.c
+++ b/net/rxrpc/krxiod.c
@@ -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);
diff --git a/net/rxrpc/krxsecd.c b/net/rxrpc/krxsecd.c
index 3ab0f77409f..9a1e7f5e034 100644
--- a/net/rxrpc/krxsecd.c
+++ b/net/rxrpc/krxsecd.c
@@ -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);
diff --git a/net/rxrpc/main.c b/net/rxrpc/main.c
index 48cbd065bb4..baec1f7fd8b 100644
--- a/net/rxrpc/main.c
+++ b/net/rxrpc/main.c
@@ -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
diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c
index 6374df7e77d..0755ae028e4 100644
--- a/net/rxrpc/sysctl.c
+++ b/net/rxrpc/sysctl.c
@@ -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,
diff --git a/net/rxrpc/transport.c b/net/rxrpc/transport.c
index 4268b38d92d..ff5f4f33308 100644
--- a/net/rxrpc/transport.c
+++ b/net/rxrpc/transport.c
@@ -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 */
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 16:24:41 +0000