diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/ping.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 7041d09ae5d5..41836ab6c200 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c | |||
@@ -22,7 +22,6 @@ | |||
22 | 22 | ||
23 | #include <asm/system.h> | 23 | #include <asm/system.h> |
24 | #include <linux/uaccess.h> | 24 | #include <linux/uaccess.h> |
25 | #include <asm/ioctls.h> | ||
26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
27 | #include <linux/fcntl.h> | 26 | #include <linux/fcntl.h> |
28 | #include <linux/socket.h> | 27 | #include <linux/socket.h> |
@@ -609,23 +608,6 @@ do_confirm: | |||
609 | goto out; | 608 | goto out; |
610 | } | 609 | } |
611 | 610 | ||
612 | /* | ||
613 | * IOCTL requests applicable to the UDP^H^H^HICMP protocol | ||
614 | */ | ||
615 | |||
616 | int ping_ioctl(struct sock *sk, int cmd, unsigned long arg) | ||
617 | { | ||
618 | pr_debug("ping_ioctl(sk=%p,sk->num=%u,cmd=%d,arg=%lu)\n", | ||
619 | inet_sk(sk), inet_sk(sk)->inet_num, cmd, arg); | ||
620 | switch (cmd) { | ||
621 | case SIOCOUTQ: | ||
622 | case SIOCINQ: | ||
623 | return udp_ioctl(sk, cmd, arg); | ||
624 | default: | ||
625 | return -ENOIOCTLCMD; | ||
626 | } | ||
627 | } | ||
628 | |||
629 | int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | 611 | int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, |
630 | size_t len, int noblock, int flags, int *addr_len) | 612 | size_t len, int noblock, int flags, int *addr_len) |
631 | { | 613 | { |
@@ -735,7 +717,6 @@ struct proto ping_prot = { | |||
735 | .close = ping_close, | 717 | .close = ping_close, |
736 | .connect = ip4_datagram_connect, | 718 | .connect = ip4_datagram_connect, |
737 | .disconnect = udp_disconnect, | 719 | .disconnect = udp_disconnect, |
738 | .ioctl = ping_ioctl, | ||
739 | .setsockopt = ip_setsockopt, | 720 | .setsockopt = ip_setsockopt, |
740 | .getsockopt = ip_getsockopt, | 721 | .getsockopt = ip_getsockopt, |
741 | .sendmsg = ping_sendmsg, | 722 | .sendmsg = ping_sendmsg, |