---

yaml --- r: 139775 b: refs/heads/master c: 377f0a0 h: refs/heads/master i: 139773: 05b4cd7 139771: c5fbe13 139767: e0e1826 139759: 9b8a62b 139743: ab5938b 139711: bfbdd06 139647: 138eab6 139519: 748b8fb 139263: 78d0ae8 v: v3
git-mirror · Mar 31, 2009 · 358f409 · 358f409
1 parent c89635c
commit 358f409
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeb5f5c9b3c8bee5ab4794323c1d23d100a9db59
+refs/heads/master: 377f0a08e4cb56658d878d22c3aed4716e283c6b
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
@@ -1081,8 +1081,7 @@ int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
  *	this, no blocking and very strange errors 8)
  */
 
-static int tcp_recv_urg(struct sock *sk, long timeo,
-			struct msghdr *msg, int len, int flags)
+static int tcp_recv_urg(struct sock *sk, struct msghdr *msg, int len, int flags)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 
@@ -1697,7 +1696,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);
+	err = tcp_recv_urg(sk, msg, len, flags);
 	goto out;
 }