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

[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
...@@ -58,7 +58,6 @@ static struct ocp_func_emac_data ibm440gx_emac2_def = { ...@@ -58,7 +58,6 @@ static struct ocp_func_emac_data ibm440gx_emac2_def = {
.wol_irq = 65, /* WOL interrupt number */ .wol_irq = 65, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */ .mdio_idx = -1, /* No shared MDIO */
.tah_idx = 0, /* TAH device index */ .tah_idx = 0, /* TAH device index */
.jumbo = 1, /* Jumbo frames supported */
}; };
static struct ocp_func_emac_data ibm440gx_emac3_def = { static struct ocp_func_emac_data ibm440gx_emac3_def = {
...@@ -72,7 +71,6 @@ 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 */ .wol_irq = 67, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */ .mdio_idx = -1, /* No shared MDIO */
.tah_idx = 1, /* TAH device index */ .tah_idx = 1, /* TAH device index */
.jumbo = 1, /* Jumbo frames supported */
}; };
OCP_SYSFS_EMAC_DATA() OCP_SYSFS_EMAC_DATA()
......
...@@ -31,7 +31,6 @@ static struct ocp_func_emac_data ibm440sp_emac0_def = { ...@@ -31,7 +31,6 @@ static struct ocp_func_emac_data ibm440sp_emac0_def = {
.wol_irq = 61, /* WOL interrupt number */ .wol_irq = 61, /* WOL interrupt number */
.mdio_idx = -1, /* No shared MDIO */ .mdio_idx = -1, /* No shared MDIO */
.tah_idx = -1, /* No TAH */ .tah_idx = -1, /* No TAH */
.jumbo = 1, /* Jumbo frames supported */
}; };
OCP_SYSFS_EMAC_DATA() OCP_SYSFS_EMAC_DATA()
......
...@@ -63,7 +63,6 @@ struct ocp_func_emac_data { ...@@ -63,7 +63,6 @@ struct ocp_func_emac_data {
int wol_irq; /* WOL interrupt */ int wol_irq; /* WOL interrupt */
int mdio_idx; /* EMAC idx of MDIO master or -1 */ int mdio_idx; /* EMAC idx of MDIO master or -1 */
int tah_idx; /* TAH device index or -1 */ int tah_idx; /* TAH device index or -1 */
int jumbo; /* Jumbo frames capable flag */
int phy_mode; /* PHY type or configurable mode */ int phy_mode; /* PHY type or configurable mode */
u8 mac_addr[6]; /* EMAC mac address */ u8 mac_addr[6]; /* EMAC mac address */
u32 phy_map; /* EMAC phy map */ u32 phy_map; /* EMAC phy map */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment