Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

2 files changed, 11 insertions, 60 deletions

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index fe865d9a3721..4cf31a2ae19c 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -243,34 +243,18 @@ static int uml_net_change_mtu(struct net_device *dev, int new_mtu)
         return err;
 }
 
-static int uml_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        static const struct ethtool_drvinfo info = {
-                .cmd     = ETHTOOL_GDRVINFO,
-                .driver  = DRIVER_NAME,
-                .version = "42",
-        };
-        void *useraddr;
-        u32 ethcmd;
-
-        switch (cmd) {
-        case SIOCETHTOOL:
-                useraddr = ifr->ifr_data;
-                if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
-                        return -EFAULT;
-                switch (ethcmd) {
-                case ETHTOOL_GDRVINFO:
-                        if (copy_to_user(useraddr, &info, sizeof(info)))
-                                return -EFAULT;
-                        return 0;
-                default:
-                        return -EOPNOTSUPP;
-                }
-        default:
-                return -EINVAL;
-        }
+static void uml_net_get_drvinfo(struct net_device *dev,
+                                struct ethtool_drvinfo *info)
+{
+        strcpy(info->driver, DRIVER_NAME);
+        strcpy(info->version, "42");
 }
 
+static struct ethtool_ops uml_net_ethtool_ops = {
+        .get_drvinfo    = uml_net_get_drvinfo,
+        .get_link       = ethtool_op_get_link,
+};
+
 void uml_net_user_timer_expire(unsigned long _conn)
 {
 #ifdef undef
@@ -359,7 +343,7 @@ static int eth_configure(int n, void *init, char *mac,
         dev->tx_timeout = uml_net_tx_timeout;
         dev->set_mac_address = uml_net_set_mac;
         dev->change_mtu = uml_net_change_mtu;
-        dev->do_ioctl = uml_net_ioctl;
+        dev->ethtool_ops = &uml_net_ethtool_ops;
         dev->watchdog_timeo = (HZ >> 1);
         dev->irq = UM_ETH_IRQ;
 
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c
index 0682ffd38175..96b9bb4a478d 100644
--- a/arch/xtensa/platform-iss/network.c
+++ b/arch/xtensa/platform-iss/network.c
@@ -611,38 +611,6 @@ static int iss_net_change_mtu(struct net_device *dev, int new_mtu)
         return -EINVAL;
 }
 
-static int iss_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-#if 0
-        static const struct ethtool_drvinfo info = {
-                .cmd     = ETHTOOL_GDRVINFO,
-                .driver  = DRIVER_NAME,
-                .version = "42",
-        };
-        void *useraddr;
-        u32 ethcmd;
-
-        switch (cmd) {
-        case SIOCETHTOOL:
-                useraddr = ifr->ifr_data;
-                if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
-                        return -EFAULT;
-
-                switch (ethcmd) {
-                        case ETHTOOL_GDRVINFO:
-                                if (copy_to_user(useraddr, &info, sizeof(info)))
-                                        return -EFAULT;
-                                return 0;
-                        default:
-                                return -EOPNOTSUPP;
-                }
-        default:
-                return -EINVAL;
-        }
-#endif
-        return -EINVAL;
-}
-
 void iss_net_user_timer_expire(unsigned long _conn)
 {
 }
@@ -730,7 +698,6 @@ static int iss_net_configure(int index, char *init)
         dev->tx_timeout = iss_net_tx_timeout;
         dev->set_mac_address = iss_net_set_mac;
         dev->change_mtu = iss_net_change_mtu;
-        dev->do_ioctl = iss_net_ioctl;
         dev->watchdog_timeo = (HZ >> 1);
         dev->irq = -1;