ff08b09570
All (still relevant) patches were refresh. The following patches were dropped because they are applied upstream: - 0003-MIPS-lantiq-handle-vmmc-memory-reservation.patch - 0005-MIPS-lantiq-add-reset-controller-api-support.patch - 0006-MIPS-lantiq-reboot-gphy-on-restart.patch - 0009-MIPS-lantiq-command-line-work-around.patch - 0010-MIPS-lantiq-export-soc-type.patch - 0011-lantiq-add-support-for-xrx200-firmware-depending-on-.patch - 0037-MIPS-lantiq-move-eiu-init-after-irq_domain-register.patch Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> SVN-Revision: 46216
25 lines
897 B
Diff
25 lines
897 B
Diff
--- a/drivers/net/ethernet/lantiq_xrx200.c
|
|
+++ b/drivers/net/ethernet/lantiq_xrx200.c
|
|
@@ -143,6 +143,7 @@
|
|
#define PMAC_IPG_MASK 0xf
|
|
#define PMAC_HD_CTL_AS 0x0008
|
|
#define PMAC_HD_CTL_AC 0x0004
|
|
+#define PMAC_HD_CTL_RC 0x0010
|
|
#define PMAC_HD_CTL_RXSH 0x0040
|
|
#define PMAC_HD_CTL_AST 0x0080
|
|
#define PMAC_HD_CTL_RST 0x0100
|
|
@@ -1502,12 +1503,12 @@ static void xrx200_hw_init(struct xrx200
|
|
#ifdef SW_ROUTING
|
|
/* enable status header, enable CRC */
|
|
ltq_pmac_w32_mask(0,
|
|
- PMAC_HD_CTL_RST | PMAC_HD_CTL_AST | PMAC_HD_CTL_RXSH | PMAC_HD_CTL_AS | PMAC_HD_CTL_AC,
|
|
+ PMAC_HD_CTL_RST | PMAC_HD_CTL_AST | PMAC_HD_CTL_RXSH | PMAC_HD_CTL_AS | PMAC_HD_CTL_AC | PMAC_HD_CTL_RC,
|
|
PMAC_HD_CTL);
|
|
#else
|
|
/* disable status header, enable CRC */
|
|
ltq_pmac_w32_mask(PMAC_HD_CTL_AST | PMAC_HD_CTL_RXSH | PMAC_HD_CTL_AS,
|
|
- PMAC_HD_CTL_AC,
|
|
+ PMAC_HD_CTL_AC | PMAC_HD_CTL_RC,
|
|
PMAC_HD_CTL);
|
|
#endif
|
|
|