* Upstream build failure due to commit d43a396af0 ('net: fs_enet: Add NAPI TX')
@ 2014-10-09 16:51 Guenter Roeck
2014-10-09 17:42 ` christophe leroy
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2014-10-09 16:51 UTC (permalink / raw)
To: Christophe Leroy
Cc: linux-kernel, David S. Miller, Pantelis Antoniou, Vitaly Bordug,
netdev
Hi,
I see the following build failure in upstream Linux.
drivers/net/ethernet/freescale/fs_enet/mac-scc.c:119:32: error: 'SCCE_ENET_TXF' undeclared
This is not surprising as SCCE_ENET_TXF is not defined anywhere in the kernel.
linux-next fails to build with the same error.
Affected builds are
powerpc:mpc85xx_defconfig
powerpc:mpc85xx_smp_defconfig
powerpc:tqm8xx_defconfig
Can you please have a look ?
Thanks,
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Upstream build failure due to commit d43a396af0 ('net: fs_enet: Add NAPI TX')
2014-10-09 16:51 Upstream build failure due to commit d43a396af0 ('net: fs_enet: Add NAPI TX') Guenter Roeck
@ 2014-10-09 17:42 ` christophe leroy
2014-10-09 17:51 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: christophe leroy @ 2014-10-09 17:42 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-kernel, David S. Miller, Pantelis Antoniou, Vitaly Bordug,
netdev
Le 09/10/2014 18:51, Guenter Roeck a écrit :
> Hi,
>
> I see the following build failure in upstream Linux.
>
> drivers/net/ethernet/freescale/fs_enet/mac-scc.c:119:32: error: 'SCCE_ENET_TXF' undeclared
>
> This is not surprising as SCCE_ENET_TXF is not defined anywhere in the kernel.
> linux-next fails to build with the same error.
>
> Affected builds are
> powerpc:mpc85xx_defconfig
> powerpc:mpc85xx_smp_defconfig
> powerpc:tqm8xx_defconfig
>
> Can you please have a look ?
>
>
Yes, fixed by the patch below submitted this afternoon.
Christophe
Subject: [PATCH] net: fs_enet: error: 'SCCE_ENET_TXF' undeclared
[linux-devel:devel-hourly-2014100909 3763/3915] drivers/net/ethernet/freescale/fs_enet/mac-scc.c:119:32: error: 'SCCE_ENET_TXF' undeclared
Due to patch d43a396 net: fs_enet: Add NAPI TX, it appears that some target
compilations are broken.
This is due to the fact that unlike the FEC, the SCC and FCC don't have a TXF
event (complete Frame transmitted) but only TXB (buffer transmitted).
Signed-off-by: Christophe Leroy<christophe.leroy@c-s.fr>
---
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 2 +-
drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
index 2c578db..08f5b91 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
@@ -125,7 +125,7 @@ out:
}
#define FCC_NAPI_RX_EVENT_MSK (FCC_ENET_RXF | FCC_ENET_RXB)
-#define FCC_NAPI_TX_EVENT_MSK (FCC_ENET_TXF | FCC_ENET_TXB)
+#define FCC_NAPI_TX_EVENT_MSK (FCC_ENET_TXB)
#define FCC_RX_EVENT (FCC_ENET_RXF)
#define FCC_TX_EVENT (FCC_ENET_TXB)
#define FCC_ERR_EVENT_MSK (FCC_ENET_TXE)
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
index 5b592a6..90c9652 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
@@ -117,7 +117,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
}
#define SCC_NAPI_RX_EVENT_MSK (SCCE_ENET_RXF | SCCE_ENET_RXB)
-#define SCC_NAPI_TX_EVENT_MSK (SCCE_ENET_TXF | SCCE_ENET_TXB)
+#define SCC_NAPI_TX_EVENT_MSK (SCCE_ENET_TXB)
#define SCC_RX_EVENT (SCCE_ENET_RXF)
#define SCC_TX_EVENT (SCCE_ENET_TXB)
#define SCC_ERR_EVENT_MSK (SCCE_ENET_TXE | SCCE_ENET_BSY)
-- 2.1.0
---
Ce courrier électronique ne contient aucun virus ou logiciel malveillant parce que la protection avast! Antivirus est active.
http://www.avast.com
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: Upstream build failure due to commit d43a396af0 ('net: fs_enet: Add NAPI TX')
2014-10-09 17:42 ` christophe leroy
@ 2014-10-09 17:51 ` Guenter Roeck
0 siblings, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2014-10-09 17:51 UTC (permalink / raw)
To: christophe leroy
Cc: linux-kernel, David S. Miller, Pantelis Antoniou, Vitaly Bordug,
netdev
On Thu, Oct 09, 2014 at 07:42:42PM +0200, christophe leroy wrote:
>
> Le 09/10/2014 18:51, Guenter Roeck a écrit :
> >Hi,
> >
> >I see the following build failure in upstream Linux.
> >
> >drivers/net/ethernet/freescale/fs_enet/mac-scc.c:119:32: error: 'SCCE_ENET_TXF' undeclared
> >
> >This is not surprising as SCCE_ENET_TXF is not defined anywhere in the kernel.
> >linux-next fails to build with the same error.
> >
> >Affected builds are
> > powerpc:mpc85xx_defconfig
> > powerpc:mpc85xx_smp_defconfig
> > powerpc:tqm8xx_defconfig
> >
> >Can you please have a look ?
> >
> >
> Yes, fixed by the patch below submitted this afternoon.
>
Excellent, thanks!
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-09 17:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-09 16:51 Upstream build failure due to commit d43a396af0 ('net: fs_enet: Add NAPI TX') Guenter Roeck
2014-10-09 17:42 ` christophe leroy
2014-10-09 17:51 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).