aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandeep Paulraj2013-04-17 10:51:56 -0500
committerMurali Karicheri2014-12-03 10:29:47 -0600
commitb1a112c865cc335e98a2a6a5778a3edbfcbcfe70 (patch)
treea0b7ed716144d7c99325b2d53581abecd187528e /drivers/net/ethernet/ti/keystone_ethss.c
parent919d9133198e35db0ef7e2b59540a42815ceb3e1 (diff)
downloadlinux-b1a112c865cc335e98a2a6a5778a3edbfcbcfe70.tar.gz
linux-b1a112c865cc335e98a2a6a5778a3edbfcbcfe70.tar.xz
linux-b1a112c865cc335e98a2a6a5778a3edbfcbcfe70.zip
net: keystone: update 1g switch ioctl handling
In this commit knowledge about whether or not packet accelerator time stamping is being removed from the driver. Also the copy_from_user is now done in the main ndo_do_ioctl itself. Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'drivers/net/ethernet/ti/keystone_ethss.c')
-rw-r--r--drivers/net/ethernet/ti/keystone_ethss.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/ethernet/ti/keystone_ethss.c b/drivers/net/ethernet/ti/keystone_ethss.c
index c20c983ad57..7fc37554aa7 100644
--- a/drivers/net/ethernet/ti/keystone_ethss.c
+++ b/drivers/net/ethernet/ti/keystone_ethss.c
@@ -843,21 +843,14 @@ int cpsw_ioctl(void *intf_priv, struct ifreq *req, int cmd)
843 struct cpsw_intf *cpsw_intf = intf_priv; 843 struct cpsw_intf *cpsw_intf = intf_priv;
844 struct cpsw_slave *slave = cpsw_intf->slaves; 844 struct cpsw_slave *slave = cpsw_intf->slaves;
845 struct phy_device *phy = slave->phy; 845 struct phy_device *phy = slave->phy;
846 struct netcp_priv *netcp = netdev_priv(cpsw_intf->ndev); 846 int ret;
847 struct hwtstamp_config cfg;
848 int ret = 0;
849
850 netcp->pa_ts_req = 1;
851 847
852 if (!phy) 848 if (!phy)
853 return -EOPNOTSUPP; 849 return -EOPNOTSUPP;
854 850
855 if (copy_from_user(&cfg, req->ifr_data, sizeof(cfg)))
856 return -EFAULT;
857
858 ret = phy_mii_ioctl(phy, req, cmd); 851 ret = phy_mii_ioctl(phy, req, cmd);
859 if (ret == 0) 852 if ((cmd == SIOCSHWTSTAMP) && (ret == -ERANGE))
860 netcp->pa_ts_req = 0; 853 ret = -EOPNOTSUPP;
861 854
862 return ret; 855 return ret;
863} 856}