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]
/
net
/
rxrpc
/
ar-input.c
diff --git
a/net/rxrpc/ar-input.c
b/net/rxrpc/ar-input.c
index 73742647c1354ebc76cdc44289fcc5948ca188ac..63b21e580de95d21c60bfeeffac7d2b0aaefaf42 100644
(file)
--- a/
net/rxrpc/ar-input.c
+++ b/
net/rxrpc/ar-input.c
@@
-113,7
+113,7
@@
int rxrpc_queue_rcv_skb(struct rxrpc_call *call, struct sk_buff *skb,
spin_unlock_bh(&sk->sk_receive_queue.lock);
if (!sock_flag(sk, SOCK_DEAD))
spin_unlock_bh(&sk->sk_receive_queue.lock);
if (!sock_flag(sk, SOCK_DEAD))
- sk->sk_data_ready(sk
, skb_len
);
+ sk->sk_data_ready(sk);
}
skb = NULL;
} else {
}
skb = NULL;
} else {
@@
-632,14
+632,14
@@
cant_find_conn:
* handle data received on the local endpoint
* - may be called in interrupt context
*/
* handle data received on the local endpoint
* - may be called in interrupt context
*/
-void rxrpc_data_ready(struct sock *sk
, int count
)
+void rxrpc_data_ready(struct sock *sk)
{
struct rxrpc_skb_priv *sp;
struct rxrpc_local *local;
struct sk_buff *skb;
int ret;
{
struct rxrpc_skb_priv *sp;
struct rxrpc_local *local;
struct sk_buff *skb;
int ret;
- _enter("%p
, %d", sk, count
);
+ _enter("%p
", sk
);
ASSERT(!irqs_disabled());
ASSERT(!irqs_disabled());