patch-2.1.89 linux/net/ipv4/tcp.c

• Lines: 24
• Date: Sun Mar 1 14:40:41 1998
• Orig file: v2.1.88/linux/net/ipv4/tcp.c
• Orig date: Thu Feb 12 20:56:14 1998

diff -u --recursive --new-file v2.1.88/linux/net/ipv4/tcp.c linux/net/ipv4/tcp.c
@@ -196,6 +196,7 @@
  *					improvement.
  *	Stefan Magdalinski	:	adjusted tcp_readable() to fix FIONREAD
  *	Willy Konynenberg	:	Transparent proxying support.
+ *	Mike McLagan		:	Routing by source
  *		Keith Owens	:	Do proper meging with partial SKB's in
  *					tcp_do_sendmsg to avoid burstiness.
  *		Eric Schenk	:	Fix fast close down bug with
@@ -585,13 +586,13 @@
  *	take care of normal races (between the test and the event) and we don't
  *	go look at any of the socket buffers directly.
  */
-unsigned int tcp_poll(struct socket *sock, poll_table *wait)
+unsigned int tcp_poll(struct file * file, struct socket *sock, poll_table *wait)
 {
 	unsigned int mask;
 	struct sock *sk = sock->sk;
 	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
 
-	poll_wait(sk->sleep, wait);
+	poll_wait(file, sk->sleep, wait);
 	if (sk->state == TCP_LISTEN)
 		return tcp_listen_poll(sk, wait);