From 358f40954a177056b274ebff230831d79f0fd2c5 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Tue, 31 Mar 2009 14:43:17 -0700 Subject: [PATCH] --- yaml --- r: 139775 b: refs/heads/master c: 377f0a08e4cb56658d878d22c3aed4716e283c6b h: refs/heads/master i: 139773: 05b4cd738cfd1771a3d5f421990d73b10779c049 139771: c5fbe137f136b74e521ba631a82cddb5fbbc954e 139767: e0e1826e4a8aaaf365148bea058c9d3b3d958f25 139759: 9b8a62bf0464c624fc55b3178f40c220b1746f15 139743: ab5938b203d82dca1be9c3f2181b45379f1b5593 139711: bfbdd06ae4d97601d57b5e483d1fb3e04207b0c0 139647: 138eab6fee5c199db58315c9ea06863436a038a3 139519: 748b8fbd349650ee79da3fc7f28c720c22fc3805 139263: 78d0ae86fae40371c332f42aaab3a939df3e8856 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1bc441046df1..f19898aa9381 100644 --- 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 index 2451aeb5ac23..fafbec8b073e 100644 --- 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; }