diff options
author | Heiko Schocher <hs@denx.de> | 2008-08-25 21:20:53 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-27 05:16:38 -0400 |
commit | f4f62301c6f42127b7462274abfcbc278f84d59a (patch) | |
tree | a14dae94a6cbcdaf244e610725fe52aee74fa9ca /arch/powerpc/include | |
parent | 34a20e89739e9ac1cb89bdf430b694d2c946ebff (diff) |
fs_enet: Fix SCC Ethernet on CPM2, and crash in fs_enet_rx_napi()
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Vitaly Bordug <vitb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/cpm2.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/cpm2.h b/arch/powerpc/include/asm/cpm2.h index 2a6fa0183ac9..0f5e8ff59a85 100644 --- a/arch/powerpc/include/asm/cpm2.h +++ b/arch/powerpc/include/asm/cpm2.h | |||
@@ -337,6 +337,11 @@ typedef struct scc_param { | |||
337 | uint scc_tcrc; /* Internal */ | 337 | uint scc_tcrc; /* Internal */ |
338 | } sccp_t; | 338 | } sccp_t; |
339 | 339 | ||
340 | /* Function code bits. | ||
341 | */ | ||
342 | #define SCC_EB ((u_char) 0x10) /* Set big endian byte order */ | ||
343 | #define SCC_GBL ((u_char) 0x20) /* Snooping enabled */ | ||
344 | |||
340 | /* CPM Ethernet through SCC1. | 345 | /* CPM Ethernet through SCC1. |
341 | */ | 346 | */ |
342 | typedef struct scc_enet { | 347 | typedef struct scc_enet { |