ixp4xx_eth: Fix up the get_ts_info ethtool method. (c1e6aaf0) · Commits · 戴 / test

Commit e77bd1ec121ee4163a6b42a44e87b2e382c39e04 added support for a new ethtool function, but that cannot compile due to a misnamed global variable. Not that it really matters (since the IXP4xx does compile either, as of about Linux 3.1) but just in case, this patch fixes the misnamed variable in the PHC driver. Signed-off-by:

Richard Cochran <richardcochran@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/ptp/ptp_ixp46x.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -284,7 +284,7 @@ static void __exit ptp_ixp_exit(void)
		{
		free_irq(MASTER_IRQ, &ixp_clock);
		free_irq(SLAVE_IRQ, &ixp_clock);
		ixp46x_phc_clock = -1;
		ixp46x_phc_index = -1;
		ptp_clock_unregister(ixp_clock.ptp_clock);
		}

		@@ -303,7 +303,7 @@ static int __init ptp_ixp_init(void)
		if (IS_ERR(ixp_clock.ptp_clock))
		return PTR_ERR(ixp_clock.ptp_clock);

		ixp46x_phc_clock = ptp_clock_index(ixp_clock.ptp_clock);
		ixp46x_phc_index = ptp_clock_index(ixp_clock.ptp_clock);

		__raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend);
		__raw_writel(1, &ixp_clock.regs->trgt_lo);

Admin message