summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorRami Rosen2009-03-31 23:43:17 +0200
committerDavid S. Miller2009-03-31 23:43:17 +0200
commit377f0a08e4cb56658d878d22c3aed4716e283c6b (patch)
tree9b18ef210d92a04dc95bd694f680e52bbdf51223 /net/ipv4/tcp.c
parentETHOC: fix build breakage on s390 (diff)
downloadkernel-qcow2-linux-377f0a08e4cb56658d878d22c3aed4716e283c6b.tar.gz
kernel-qcow2-linux-377f0a08e4cb56658d878d22c3aed4716e283c6b.tar.xz
kernel-qcow2-linux-377f0a08e4cb56658d878d22c3aed4716e283c6b.zip
ipv4: remove unused parameter from tcp_recv_urg().
Signed-off-by: Rami Rosen <ramirose@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 2451aeb5ac23..fafbec8b073e 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1081,8 +1081,7 @@ out_err:
* 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 @@ out:
return err;
recv_urg:
- err = tcp_recv_urg(sk, timeo, msg, len, flags);
+ err = tcp_recv_urg(sk, msg, len, flags);
goto out;
}