atheros: ar231x-eth: remove useless IOCTL handlers

These IOCTLs handled in the core now.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
SVN-Revision: 42492

diff --git a/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch b/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch
index 9bf9abb9984e15cf2e48c16fe3d315c71e9e97d9..657f96c7b9e35ef203e54e88302d5f2a5fb62f19 100644 (file)
--- a/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch
@@ -33,7 +33,7 @@
 +obj-$(CONFIG_NET_AR231X) += ar231x.o
 --- /dev/null
 +++ b/drivers/net/ethernet/atheros/ar231x/ar231x.c
-@@ -0,0 +1,1250 @@
+@@ -0,0 +1,1231 @@
 +/*
 + * ar231x.c: Linux driver for the Atheros AR231x Ethernet device.
 + *
@@ -1138,27 +1138,8 @@
 +static int ar231x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 +{
 +      struct ar231x_private *sp = netdev_priv(dev);
-+      int ret;
 +
 +      switch (cmd) {
-+      case SIOCETHTOOL:
-+              spin_lock_irq(&sp->lock);
-+              ret = phy_ethtool_ioctl(sp->phy_dev, (void *)ifr->ifr_data);
-+              spin_unlock_irq(&sp->lock);
-+              return ret;
-+
-+      case SIOCSIFHWADDR:
-+              if (copy_from_user
-+                      (dev->dev_addr, ifr->ifr_data, sizeof(dev->dev_addr)))
-+                      return -EFAULT;
-+              return 0;
-+
-+      case SIOCGIFHWADDR:
-+              if (copy_to_user
-+                      (ifr->ifr_data, dev->dev_addr, sizeof(dev->dev_addr)))
-+                      return -EFAULT;
-+              return 0;
-+
 +      case SIOCGMIIPHY:
 +      case SIOCGMIIREG:
 +      case SIOCSMIIREG:

diff --git a/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch
index abda9ce76bb76388f29a0f2faa20c0a29877882d..766ec8d40910f59b75935e820326dc2246946021 100644 (file)
--- a/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch
+++ b/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch
@@ -79,13 +79,13 @@
        kfree(dev);
        return 0;
  }
-@@ -1104,6 +1151,9 @@ static int ar231x_ioctl(struct net_devic
+@@ -1103,6 +1150,9 @@ static int ar231x_ioctl(struct net_devic
+ {
        struct ar231x_private *sp = netdev_priv(dev);
-       int ret;
  
 +      if (!sp->phy_dev)
 +              return -ENODEV;
 +
        switch (cmd) {
-       case SIOCETHTOOL:
-               spin_lock_irq(&sp->lock);
+       case SIOCGMIIPHY:
+       case SIOCGMIIREG: