diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/server.c | 4 | ||||
-rw-r--r-- | net/tipc/socket.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c index 646a930eefbf..a538a02f869b 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c | |||
@@ -119,7 +119,7 @@ static struct tipc_conn *tipc_conn_lookup(struct tipc_server *s, int conid) | |||
119 | return con; | 119 | return con; |
120 | } | 120 | } |
121 | 121 | ||
122 | static void sock_data_ready(struct sock *sk, int unused) | 122 | static void sock_data_ready(struct sock *sk) |
123 | { | 123 | { |
124 | struct tipc_conn *con; | 124 | struct tipc_conn *con; |
125 | 125 | ||
@@ -297,7 +297,7 @@ static int tipc_accept_from_sock(struct tipc_conn *con) | |||
297 | newcon->usr_data = s->tipc_conn_new(newcon->conid); | 297 | newcon->usr_data = s->tipc_conn_new(newcon->conid); |
298 | 298 | ||
299 | /* Wake up receive process in case of 'SYN+' message */ | 299 | /* Wake up receive process in case of 'SYN+' message */ |
300 | newsock->sk->sk_data_ready(newsock->sk, 0); | 300 | newsock->sk->sk_data_ready(newsock->sk); |
301 | return ret; | 301 | return ret; |
302 | } | 302 | } |
303 | 303 | ||
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index adc12e227303..3c0256962f7d 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #define CONN_TIMEOUT_DEFAULT 8000 /* default connect timeout = 8s */ | 45 | #define CONN_TIMEOUT_DEFAULT 8000 /* default connect timeout = 8s */ |
46 | 46 | ||
47 | static int backlog_rcv(struct sock *sk, struct sk_buff *skb); | 47 | static int backlog_rcv(struct sock *sk, struct sk_buff *skb); |
48 | static void tipc_data_ready(struct sock *sk, int len); | 48 | static void tipc_data_ready(struct sock *sk); |
49 | static void tipc_write_space(struct sock *sk); | 49 | static void tipc_write_space(struct sock *sk); |
50 | static int tipc_release(struct socket *sock); | 50 | static int tipc_release(struct socket *sock); |
51 | static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags); | 51 | static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags); |
@@ -1248,7 +1248,7 @@ static void tipc_write_space(struct sock *sk) | |||
1248 | * @sk: socket | 1248 | * @sk: socket |
1249 | * @len: the length of messages | 1249 | * @len: the length of messages |
1250 | */ | 1250 | */ |
1251 | static void tipc_data_ready(struct sock *sk, int len) | 1251 | static void tipc_data_ready(struct sock *sk) |
1252 | { | 1252 | { |
1253 | struct socket_wq *wq; | 1253 | struct socket_wq *wq; |
1254 | 1254 | ||
@@ -1410,7 +1410,7 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf) | |||
1410 | __skb_queue_tail(&sk->sk_receive_queue, buf); | 1410 | __skb_queue_tail(&sk->sk_receive_queue, buf); |
1411 | skb_set_owner_r(buf, sk); | 1411 | skb_set_owner_r(buf, sk); |
1412 | 1412 | ||
1413 | sk->sk_data_ready(sk, 0); | 1413 | sk->sk_data_ready(sk); |
1414 | return TIPC_OK; | 1414 | return TIPC_OK; |
1415 | } | 1415 | } |
1416 | 1416 | ||