17 files changed, 27 insertions, 40 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 296f186802ff..a5144e43aae1 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1763,7 +1763,7 @@ static int atalk_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
  */
 static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
-        int rc = -EINVAL;
+        int rc = -ENOIOCTLCMD;
         struct sock *sk = sock->sk;
         void __user *argp = (void __user *)arg;
 
@@ -1813,23 +1813,6 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                         rc = atif_ioctl(cmd, argp);
                         rtnl_unlock();
                         break;
-                /* Physical layer ioctl calls */
-                case SIOCSIFLINK:
-                case SIOCGIFHWADDR:
-                case SIOCSIFHWADDR:
-                case SIOCGIFFLAGS:
-                case SIOCSIFFLAGS:
-                case SIOCGIFTXQLEN:
-                case SIOCSIFTXQLEN:
-                case SIOCGIFMTU:
-                case SIOCGIFCONF:
-                case SIOCADDMULTI:
-                case SIOCDELMULTI:
-                case SIOCGIFCOUNT:
-                case SIOCGIFINDEX:
-                case SIOCGIFNAME:
-                        rc = dev_ioctl(cmd, argp);
-                        break;
         }
 
         return rc;
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 8b5d10aaba05..e8753c7fcad1 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1827,7 +1827,7 @@ static int ax25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 break;
 
         default:
-                res = dev_ioctl(cmd, argp);
+                res = -ENOIOCTLCMD;
                 break;
         }
         release_sock(sk);
diff --git a/net/core/dev.c b/net/core/dev.c
index a5efc9ae010b..29ba109d3e54 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3276,7 +3276,6 @@ EXPORT_SYMBOL(dev_close);
 EXPORT_SYMBOL(dev_get_by_flags);
 EXPORT_SYMBOL(dev_get_by_index);
 EXPORT_SYMBOL(dev_get_by_name);
-EXPORT_SYMBOL(dev_ioctl);
 EXPORT_SYMBOL(dev_open);
 EXPORT_SYMBOL(dev_queue_xmit);
 EXPORT_SYMBOL(dev_remove_pack);
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 65e3baed0251..78ec5344be86 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1252,7 +1252,7 @@ static int dn_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 break;
 
         default:
-                err = dev_ioctl(cmd, (void __user *)arg);
+                err = -ENOIOCTLCMD;
                 break;
         }
 
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 70fb2b88da65..4fc245243cca 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -687,7 +687,7 @@ static int econet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
                         break;
 
                 default:
-                        return dev_ioctl(cmd, argp);
+                        return -ENOIOCTLCMD;
         }
         /*NOTREACHED*/
         return 0;
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 36a6306ca5a3..966a071a408c 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -777,10 +777,10 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                         err = devinet_ioctl(cmd, (void __user *)arg);
                         break;
                 default:
-                        if (!sk->sk_prot->ioctl ||
-                            (err = sk->sk_prot->ioctl(sk, cmd, arg)) ==
-                                                                -ENOIOCTLCMD)
-                                err = dev_ioctl(cmd, (void __user *)arg);
+                        if (sk->sk_prot->ioctl)
+                                err = sk->sk_prot->ioctl(sk, cmd, arg);
+                        else
+                                err = -ENOIOCTLCMD;
                         break;
         }
         return err;
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 7c9f19269f21..68afc53be662 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -434,7 +434,6 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
 int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
         struct sock *sk = sock->sk;
-        int err = -EINVAL;
 
         switch(cmd) 
         {
@@ -453,10 +452,9 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         case SIOCSIFDSTADDR:
                 return addrconf_set_dstaddr((void __user *) arg);
         default:
-                if (!sk->sk_prot->ioctl ||
-                    (err = sk->sk_prot->ioctl(sk, cmd, arg)) == -ENOIOCTLCMD)
-                        return(dev_ioctl(cmd,(void __user *) arg));             
-                return err;
+                if (!sk->sk_prot->ioctl)
+                        return -ENOIOCTLCMD;
+                return sk->sk_prot->ioctl(sk, cmd, arg);
         }
         /*NOTREACHED*/
         return(0);
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 6c464c11bb09..0dc519b40404 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -1884,7 +1884,7 @@ static int ipx_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 rc = -EINVAL;
                 break;
         default:
-                rc = dev_ioctl(cmd, argp);
+                rc = -ENOIOCTLCMD;
                 break;
         }
 
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index e57683d424f7..fbfa96754417 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -1822,7 +1822,7 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 return -EINVAL;
         default:
                 IRDA_DEBUG(1, "%s(), doing device ioctl!\n", __FUNCTION__);
-                return dev_ioctl(cmd, (void __user *) arg);
+                return -ENOIOCTLCMD;
         }
 
         /*NOTREACHED*/
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 9cf65f9d8902..8171c53bc0ed 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -959,7 +959,7 @@ out:
 static int llc_ui_ioctl(struct socket *sock, unsigned int cmd,
                         unsigned long arg)
 {
-        return dev_ioctl(cmd, (void __user *)arg);
+        return -ENOIOCTLCMD;
 }
 
 /**
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 9ee672e19ec1..63b0e4afeb33 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1215,7 +1215,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 return nr_rt_ioctl(cmd, argp);
 
         default:
-                return dev_ioctl(cmd, argp);
+                return -ENOIOCTLCMD;
         }
 
         return 0;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index deda6fdb1e53..f69e5ed9bd06 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1521,7 +1521,7 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd,
 #endif
 
                 default:
-                        return dev_ioctl(cmd, (void __user *)arg);
+                        return -ENOIOCTLCMD;
         }
         return 0;
 }
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 829fdbc4400b..63090be2315a 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1320,7 +1320,7 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 return 0;
 
         default:
-                return dev_ioctl(cmd, argp);
+                return -ENOIOCTLCMD;
         }
 
         return 0;
diff --git a/net/socket.c b/net/socket.c
index 0dde6dade2b1..06fa217f58a9 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -900,6 +900,13 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                         break;
                 default:
                         err = sock->ops->ioctl(sock, cmd, arg);
+
+                        /*
+                         * If this ioctl is unknown try to hand it down
+                         * to the NIC driver.
+                         */
+                        if (err == -ENOIOCTLCMD)
+                                err = dev_ioctl(cmd, argp);
                         break;
         }
         return err;
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 1ddd36d50091..5f6ae79b8b16 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1859,7 +1859,7 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 }
 
                 default:
-                        err = dev_ioctl(cmd, (void __user *)arg);
+                        err = -ENOIOCTLCMD;
                         break;
         }
         return err;
diff --git a/net/wanrouter/af_wanpipe.c b/net/wanrouter/af_wanpipe.c
index 67948bf22dc4..7a43ae4721ed 100644
--- a/net/wanrouter/af_wanpipe.c
+++ b/net/wanrouter/af_wanpipe.c
@@ -1839,7 +1839,7 @@ static int wanpipe_ioctl(struct socket *sock, unsigned int cmd, unsigned long ar
 #endif
 
                 default:
-                        return dev_ioctl(cmd,(void __user *) arg);
+                        return -ENOIOCTLCMD;
         }
         /*NOTREACHED*/
 }
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index ca8b3b0b920d..16459c7f54b2 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1378,7 +1378,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 }
 
                 default:
-                        rc = dev_ioctl(cmd, argp);
+                        rc = -ENOIOCTLCMD;
                         break;
         }