[PATCH 0/1] for 3.6 - fix gianfar build failure

[PATCH 0/1] for 3.6 - fix gianfar build failure

[Richard Cochran]

The gianfar ethtool time stamping change doesn't even build. This
should really get fixed for 3.6 if at all possible.

Thanks,
Richard


Richard Cochran (1):
  gianfar: fix phc index build failure

 drivers/net/ethernet/freescale/gianfar_ethtool.c |    1 +
 drivers/net/ethernet/freescale/gianfar_ptp.c     |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
1.7.2.5

[PATCH 1/1] gianfar: fix phc index build failure

[Richard Cochran]

This patch fixes a build failure introduced in commit 66636287. 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: Richard Cochran <richardcochran@gmail.com>
Cc: <stable@vger.kernel.org>
---
 drivers/net/ethernet/freescale/gianfar_ethtool.c |    1 +
 drivers/net/ethernet/freescale/gianfar_ptp.c     |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 8971921..ab6762c 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -1773,6 +1773,7 @@ static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
 }
 
 int gfar_phc_index = -1;
+EXPORT_SYMBOL(gfar_phc_index);
 
 static int gfar_get_ts_info(struct net_device *dev,
 			    struct ethtool_ts_info *info)
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index c08e5d4..0daa66b 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -515,7 +515,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
 		err = PTR_ERR(etsects->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);
 
@@ -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_ctrl,   0);
 
-	gfar_phc_clock = -1;
+	gfar_phc_index = -1;
 	ptp_clock_unregister(etsects->clock);
 	iounmap(etsects->regs);
 	release_resource(etsects->rsrc);
-- 
1.7.2.5

Re: [PATCH 1/1] gianfar: fix phc index build failure

[David Miller]

From: Richard Cochran <richardcochran@gmail.com>
Date: Fri, 21 Sep 2012 07:11:12 +0200

> This patch fixes a build failure introduced in commit 66636287. 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: Richard Cochran <richardcochran@gmail.com>

Applied and queued up for -stable, thanks.

> Cc: <stable@vger.kernel.org>

Do not add -stable CC:'s to networking patches, please instead simply
ask me to queue it up for -stable as I take care of networking stable
submissions myself rather than via the automated procedure.