linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / appletalk / ddp.c

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 7b1eb9a..697ac55 100644 (file)
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1819,22 +1819,6 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
        return rc;
 }
 
-
-#ifdef CONFIG_COMPAT
-static int atalk_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
-{
-       /*
-        * All Appletalk ioctls except SIOCATALKDIFADDR are standard.  And
-        * SIOCATALKDIFADDR is handled by upper layer as well, so there is
-        * nothing to do.  Eventually SIOCATALKDIFADDR should be moved
-        * here so there is no generic SIOCPROTOPRIVATE translation in the
-        * system.
-        */
-       return -ENOIOCTLCMD;
-}
-#endif
-
-
 static struct net_proto_family atalk_family_ops = {
        .family         = PF_APPLETALK,
        .create         = atalk_create,
@@ -1852,9 +1836,6 @@ static const struct proto_ops SOCKOPS_WRAPPED(atalk_dgram_ops) = {
        .getname        = atalk_getname,
        .poll           = datagram_poll,
        .ioctl          = atalk_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl   = atalk_compat_ioctl,
-#endif
        .listen         = sock_no_listen,
        .shutdown       = sock_no_shutdown,
        .setsockopt     = sock_no_setsockopt,