From: Eugene Surovegin <ebs@ebshome.net> Fix PowerPC NPe405H EMAC Tx channel assignments. EMAC unit in this chip uses common for 4xx "two Tx / one Rx" configuration. Signed-off-by: Eugene Surovegin <ebs@ebshome.net> Signed-off-by: Andrew Morton <akpm@osdl.org> --- arch/ppc/platforms/4xx/ibmnp405h.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/ppc/platforms/4xx/ibmnp405h.c~ppc32-fix-emac-tx-channel-assignments-for-npe405h arch/ppc/platforms/4xx/ibmnp405h.c --- devel/arch/ppc/platforms/4xx/ibmnp405h.c~ppc32-fix-emac-tx-channel-assignments-for-npe405h 2005-08-19 19:33:35.000000000 -0700 +++ devel-akpm/arch/ppc/platforms/4xx/ibmnp405h.c 2005-08-19 19:33:35.000000000 -0700 @@ -34,7 +34,7 @@ static struct ocp_func_emac_data ibmnp40 .zmii_mux = 1, /* ZMII input of this EMAC */ .mal_idx = 0, /* MAL device index */ .mal_rx_chan = 1, /* MAL rx channel number */ - .mal_tx_chan = 1, /* MAL tx channel number */ + .mal_tx_chan = 2, /* MAL tx channel number */ .wol_irq = 41, /* WOL interrupt number */ .mdio_idx = -1, /* No shared MDIO */ .tah_idx = -1, /* No TAH */ @@ -46,7 +46,7 @@ static struct ocp_func_emac_data ibmnp40 .zmii_mux = 2, /* ZMII input of this EMAC */ .mal_idx = 0, /* MAL device index */ .mal_rx_chan = 2, /* MAL rx channel number */ - .mal_tx_chan = 2, /* MAL tx channel number */ + .mal_tx_chan = 4, /* MAL tx channel number */ .wol_irq = 41, /* WOL interrupt number */ .mdio_idx = -1, /* No shared MDIO */ .tah_idx = -1, /* No TAH */ @@ -58,7 +58,7 @@ static struct ocp_func_emac_data ibmnp40 .zmii_mux = 3, /* ZMII input of this EMAC */ .mal_idx = 0, /* MAL device index */ .mal_rx_chan = 3, /* MAL rx channel number */ - .mal_tx_chan = 3, /* MAL tx channel number */ + .mal_tx_chan = 6, /* MAL tx channel number */ .wol_irq = 41, /* WOL interrupt number */ .mdio_idx = -1, /* No shared MDIO */ .tah_idx = -1, /* No TAH */ _