net: fs_enet: error: 'SCCE_ENET_TXF' undeclared

PATCH Applied Christophe Leroy 2 participants 2 messages Oct 9, 2014 – Oct 10, 2014

Subsystems (3)

Networking Network drivers Freescale SoC FS_ENET driver

lore

Share & tools

lore

Christophe Leroy

author

2014-10-09 14:54 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 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(-)

drivers/net/ethernet/freescale/fs_enet/mac-fcc.c +1 -1

index 2c578db..08f5b91 100644
@@ -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)

drivers/net/ethernet/freescale/fs_enet/mac-scc.c +1 -1

index 5b592a6..90c9652 100644
@@ -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)

Signature · 1 line

2.1.0

David Miller

maintainer Applied

2014-10-10 04:51 UTC #1 lore raw

From: Christophe Leroy <[email protected]>
Date: Thu, 9 Oct 2014 16:54:43 +0200 (CEST)

Quoted 8 lines

[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 <[email protected]>

Applied, thanks.