aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/ti/cpsw.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 02c24777e23b..c9714e1c164a 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -812,8 +812,9 @@ static void cpsw_hwtstamp_v2(struct cpsw_priv *priv)
812 __raw_writel(ETH_P_1588, &priv->regs->ts_ltype); 812 __raw_writel(ETH_P_1588, &priv->regs->ts_ltype);
813} 813}
814 814
815static int cpsw_hwtstamp_ioctl(struct cpsw_priv *priv, struct ifreq *ifr) 815static int cpsw_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
816{ 816{
817 struct cpsw_priv *priv = netdev_priv(dev);
817 struct cpts *cpts = &priv->cpts; 818 struct cpts *cpts = &priv->cpts;
818 struct hwtstamp_config cfg; 819 struct hwtstamp_config cfg;
819 820
@@ -878,14 +879,12 @@ static int cpsw_hwtstamp_ioctl(struct cpsw_priv *priv, struct ifreq *ifr)
878 879
879static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd) 880static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
880{ 881{
881 struct cpsw_priv *priv = netdev_priv(dev);
882
883 if (!netif_running(dev)) 882 if (!netif_running(dev))
884 return -EINVAL; 883 return -EINVAL;
885 884
886#ifdef CONFIG_TI_CPTS 885#ifdef CONFIG_TI_CPTS
887 if (cmd == SIOCSHWTSTAMP) 886 if (cmd == SIOCSHWTSTAMP)
888 return cpsw_hwtstamp_ioctl(priv, req); 887 return cpsw_hwtstamp_ioctl(dev, req);
889#endif 888#endif
890 return -ENOTSUPP; 889 return -ENOTSUPP;
891} 890}