diff options
author | LEROY Christophe <christophe.leroy@c-s.fr> | 2014-10-09 10:54:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-10 00:51:24 -0400 |
commit | 7b4ecf39a2fb2285b3ffc869411461a3e83e1b63 (patch) | |
tree | 58eff059884ba26d61b1d6f80659c723887c9f2e /drivers/net/ethernet/freescale | |
parent | b8358d70ce1066dd4cc658cfdaf7862d459e2d78 (diff) |
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale')
-rw-r--r-- | drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 2 | ||||
-rw-r--r-- | 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 2c578db401e8..08f5b911d96b 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: | |||
125 | } | 125 | } |
126 | 126 | ||
127 | #define FCC_NAPI_RX_EVENT_MSK (FCC_ENET_RXF | FCC_ENET_RXB) | 127 | #define FCC_NAPI_RX_EVENT_MSK (FCC_ENET_RXF | FCC_ENET_RXB) |
128 | #define FCC_NAPI_TX_EVENT_MSK (FCC_ENET_TXF | FCC_ENET_TXB) | 128 | #define FCC_NAPI_TX_EVENT_MSK (FCC_ENET_TXB) |
129 | #define FCC_RX_EVENT (FCC_ENET_RXF) | 129 | #define FCC_RX_EVENT (FCC_ENET_RXF) |
130 | #define FCC_TX_EVENT (FCC_ENET_TXB) | 130 | #define FCC_TX_EVENT (FCC_ENET_TXB) |
131 | #define FCC_ERR_EVENT_MSK (FCC_ENET_TXE) | 131 | #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 41aa0b475ca0..f30411f0701f 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c | |||
@@ -116,7 +116,7 @@ static int do_pd_setup(struct fs_enet_private *fep) | |||
116 | } | 116 | } |
117 | 117 | ||
118 | #define SCC_NAPI_RX_EVENT_MSK (SCCE_ENET_RXF | SCCE_ENET_RXB) | 118 | #define SCC_NAPI_RX_EVENT_MSK (SCCE_ENET_RXF | SCCE_ENET_RXB) |
119 | #define SCC_NAPI_TX_EVENT_MSK (SCCE_ENET_TXF | SCCE_ENET_TXB) | 119 | #define SCC_NAPI_TX_EVENT_MSK (SCCE_ENET_TXB) |
120 | #define SCC_RX_EVENT (SCCE_ENET_RXF) | 120 | #define SCC_RX_EVENT (SCCE_ENET_RXF) |
121 | #define SCC_TX_EVENT (SCCE_ENET_TXB) | 121 | #define SCC_TX_EVENT (SCCE_ENET_TXB) |
122 | #define SCC_ERR_EVENT_MSK (SCCE_ENET_TXE | SCCE_ENET_BSY) | 122 | #define SCC_ERR_EVENT_MSK (SCCE_ENET_TXE | SCCE_ENET_BSY) |