projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
[cascardo/linux.git]
/
net
/
rds
/
tcp_recv.c
diff --git
a/net/rds/tcp_recv.c
b/net/rds/tcp_recv.c
index
4fac4f2
..
9ae6e0a
100644
(file)
--- a/
net/rds/tcp_recv.c
+++ b/
net/rds/tcp_recv.c
@@
-314,13
+314,13
@@
int rds_tcp_recv(struct rds_connection *conn)
return ret;
}
return ret;
}
-void rds_tcp_data_ready(struct sock *sk
, int bytes
)
+void rds_tcp_data_ready(struct sock *sk)
{
{
- void (*ready)(struct sock *sk
, int bytes
);
+ void (*ready)(struct sock *sk);
struct rds_connection *conn;
struct rds_tcp_connection *tc;
struct rds_connection *conn;
struct rds_tcp_connection *tc;
- rdsdebug("data ready sk %p
bytes %d\n", sk, bytes
);
+ rdsdebug("data ready sk %p
\n", sk
);
read_lock(&sk->sk_callback_lock);
conn = sk->sk_user_data;
read_lock(&sk->sk_callback_lock);
conn = sk->sk_user_data;
@@
-337,7
+337,7
@@
void rds_tcp_data_ready(struct sock *sk, int bytes)
queue_delayed_work(rds_wq, &conn->c_recv_w, 0);
out:
read_unlock(&sk->sk_callback_lock);
queue_delayed_work(rds_wq, &conn->c_recv_w, 0);
out:
read_unlock(&sk->sk_callback_lock);
- ready(sk
, bytes
);
+ ready(sk);
}
int rds_tcp_recv_init(void)
}
int rds_tcp_recv_init(void)