Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28889b7e authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller
Browse files

gianfar: fix phc index build failure 



This patch fixes a build failure introduced in commit 66636287
("gianfar: Support the get_ts_info ethtool method."). Not only was a
global variable inconsistently named, but also it was not exported as
it should have been.

This fix is also needed in stable version 3.5.

Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f950c0ec

drivers/net/ethernet/freescale/gianfar_ethtool.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1773,6 +1773,7 @@ static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd, 
}

}





int gfar_phc_index = -1;

int gfar_phc_index = -1;

EXPORT_SYMBOL(gfar_phc_index);





static int gfar_get_ts_info(struct net_device *dev,

static int gfar_get_ts_info(struct net_device *dev,

			    struct ethtool_ts_info *info)

			    struct ethtool_ts_info *info)

drivers/net/ethernet/freescale/gianfar_ptp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -515,7 +515,7 @@ static int gianfar_ptp_probe(struct platform_device *dev) 
		err = PTR_ERR(etsects->clock);

		err = PTR_ERR(etsects->clock);

		goto no_clock;

		goto no_clock;

	}

	}

	gfar_phc_clock = ptp_clock_index(etsects->clock);

	gfar_phc_index = ptp_clock_index(etsects->clock);





	dev_set_drvdata(&dev->dev, etsects);

	dev_set_drvdata(&dev->dev, etsects);
@@ -539,7 +539,7 @@ static int gianfar_ptp_remove(struct platform_device *dev) 
	gfar_write(&etsects->regs->tmr_temask, 0);

	gfar_write(&etsects->regs->tmr_temask, 0);

	gfar_write(&etsects->regs->tmr_ctrl,   0);

	gfar_write(&etsects->regs->tmr_ctrl,   0);





	gfar_phc_clock = -1;

	gfar_phc_index = -1;

	ptp_clock_unregister(etsects->clock);

	ptp_clock_unregister(etsects->clock);

	iounmap(etsects->regs);

	iounmap(etsects->regs);

	release_resource(etsects->rsrc);

	release_resource(etsects->rsrc);