projects
/
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/davem/net
[linux.git]
/
fs
/
ocfs2
/
cluster
/
tcp_internal.h
diff --git
a/fs/ocfs2/cluster/tcp_internal.h
b/fs/ocfs2/cluster/tcp_internal.h
index 4cbcb65784a358b6e10703b589b724b18a71022d..dc024367110a60d157d0d46c671f35e1e611f2a6 100644
(file)
--- a/
fs/ocfs2/cluster/tcp_internal.h
+++ b/
fs/ocfs2/cluster/tcp_internal.h
@@
-165,7
+165,7
@@
struct o2net_sock_container {
/* original handlers for the sockets */
void (*sc_state_change)(struct sock *sk);
- void (*sc_data_ready)(struct sock *sk
, int bytes
);
+ void (*sc_data_ready)(struct sock *sk);
u32 sc_msg_key;
u16 sc_msg_type;