patch-2.1.23 linux/net/ipv4/af_inet.c

Next file: linux/net/ipv4/arp.c
Previous file: linux/net/ethernet/eth.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.22/linux/net/ipv4/af_inet.c linux/net/ipv4/af_inet.c
@@ -1188,13 +1188,13 @@
 }
 
 
-int inet_select(struct socket *sock, int sel_type, select_table *wait)
+unsigned int inet_poll(struct socket *sock, poll_table *wait)
 {
 	struct sock *sk = sock->sk;
 
-	if (sk->prot->select == NULL)
+	if (sk->prot->poll == NULL)
 		return(0);
-	return sk->prot->select(sock, sel_type, wait);
+	return sk->prot->poll(sock, wait);
 }
 
 /*
@@ -1589,7 +1589,7 @@
 	NULL,
 	inet_accept,
 	inet_getname, 
-	inet_select,
+	inet_poll,
 	inet_ioctl,
 	inet_listen,
 	inet_shutdown,
@@ -1610,7 +1610,7 @@
 	NULL,
 	NULL,
 	inet_getname, 
-	datagram_select,
+	datagram_poll,
 	inet_ioctl,
 	NULL,
 	inet_shutdown,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov