Commit fa57f9c2 authored by Eugene Surovegin's avatar Eugene Surovegin Committed by Linus Torvalds
Browse files

[PATCH] ppc32: remove "jumbo" member from ocp_func_emac_data 



Remove the not needed anymore "jumbo" member from ocp_func_emac_data.
Jumbo frame support is handled by PPC4xx EMAC driver internally now.

Signed-off-by: default avatarEugene Surovegin <ebs@ebshome.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1ae8f407

arch/ppc/platforms/4xx/ibm440gx.c

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ static struct ocp_func_emac_data ibm440gx_emac2_def = { 
	.wol_irq        = 65,  		/* WOL interrupt number */

	.mdio_idx       = -1,           /* No shared MDIO */

	.tah_idx	= 0,		/* TAH device index */

	.jumbo		= 1,		/* Jumbo frames supported */

};



static struct ocp_func_emac_data ibm440gx_emac3_def = {
@@ -72,7 +71,6 @@ static struct ocp_func_emac_data ibm440gx_emac3_def = { 
	.wol_irq        = 67,  		/* WOL interrupt number */

	.mdio_idx       = -1,           /* No shared MDIO */

	.tah_idx	= 1,		/* TAH device index */

	.jumbo		= 1,		/* Jumbo frames supported */

};

OCP_SYSFS_EMAC_DATA()

arch/ppc/platforms/4xx/ibm440sp.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ static struct ocp_func_emac_data ibm440sp_emac0_def = { 
	.wol_irq        = 61,  		/* WOL interrupt number */

	.mdio_idx       = -1,           /* No shared MDIO */

	.tah_idx	= -1,		/* No TAH */

	.jumbo		= 1,		/* Jumbo frames supported */

};

OCP_SYSFS_EMAC_DATA()

include/asm-ppc/ibm_ocp.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ struct ocp_func_emac_data { 
	int	wol_irq;	/* WOL interrupt */

	int	mdio_idx;	/* EMAC idx of MDIO master or -1 */

	int	tah_idx;	/* TAH device index or -1 */

	int	jumbo;		/* Jumbo frames capable flag */

	int	phy_mode;	/* PHY type or configurable mode */

	u8	mac_addr[6];	/* EMAC mac address */

	u32	phy_map;	/* EMAC phy map */

CRA Git | Maintained and supported by SUSTech CRA and CCSE