diff options
| author | John Crispin <blogic@openwrt.org> | 2014-09-12 06:52:07 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-09-12 06:52:07 +0000 |
| commit | e66c3b8925e244b4d68ab2d1190a78ce60691d7c (patch) | |
| tree | 71228d400ae53b4b820a4a1828390197afe7026c | |
| parent | 02d37cc0e70b2a25f7ad48d7d7552d364b67820c (diff) | |
| download | master-187ad058-e66c3b8925e244b4d68ab2d1190a78ce60691d7c.tar.gz master-187ad058-e66c3b8925e244b4d68ab2d1190a78ce60691d7c.tar.bz2 master-187ad058-e66c3b8925e244b4d68ab2d1190a78ce60691d7c.zip | |
atheros: ar231x-eth: remove useless IOCTL handlers
These IOCTLs handled in the core now.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42492 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch | 21 | ||||
| -rw-r--r-- | target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch | 8 |
2 files changed, 5 insertions, 24 deletions
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 9bf9abb998..657f96c7b9 100644 --- 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 abda9ce76b..766ec8d409 100644 --- 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: |