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

Commit 7b4ecf39 authored by LEROY Christophe's avatar LEROY Christophe Committed by David S. Miller
Browse files

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 d43a396a 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: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8358d70

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ out: 
}

}





#define FCC_NAPI_RX_EVENT_MSK	(FCC_ENET_RXF | FCC_ENET_RXB)

#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_RX_EVENT		(FCC_ENET_RXF)

#define FCC_TX_EVENT		(FCC_ENET_TXB)

#define FCC_TX_EVENT		(FCC_ENET_TXB)

#define FCC_ERR_EVENT_MSK	(FCC_ENET_TXE)

#define FCC_ERR_EVENT_MSK	(FCC_ENET_TXE)

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -116,7 +116,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_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_RX_EVENT		(SCCE_ENET_RXF)

#define SCC_TX_EVENT		(SCCE_ENET_TXB)

#define SCC_TX_EVENT		(SCCE_ENET_TXB)

#define SCC_ERR_EVENT_MSK	(SCCE_ENET_TXE | SCCE_ENET_BSY)

#define SCC_ERR_EVENT_MSK	(SCCE_ENET_TXE | SCCE_ENET_BSY)