From f46221cda855c06e09f635ea3c0bfb06eef0b064 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Wed, 18 Mar 2009 18:50:09 -0700 Subject: [PATCH] --- yaml --- r: 135293 b: refs/heads/master c: beedad923ad6237f03265fdf86eb8a1b50d14ae9 h: refs/heads/master i: 135291: d777f224faff36a2a615a1be2035f6d40970a844 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b9aa50f33564..a06135542ac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bdd8d40c8c59435664af6049dabe24b7779b203 +refs/heads/master: beedad923ad6237f03265fdf86eb8a1b50d14ae9 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index 1c4d42ff72bd..2451aeb5ac23 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -1082,8 +1082,7 @@ int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, */ static int tcp_recv_urg(struct sock *sk, long timeo, - struct msghdr *msg, int len, int flags, - int *addr_len) + struct msghdr *msg, int len, int flags) { struct tcp_sock *tp = tcp_sk(sk); @@ -1698,7 +1697,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, return err; recv_urg: - err = tcp_recv_urg(sk, timeo, msg, len, flags, addr_len); + err = tcp_recv_urg(sk, timeo, msg, len, flags); goto out; }