Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 990e27b0 authored Mar 28, 2017 by Vivien Didelot Committed by David S. Miller Mar 28, 2017

net: dsa: mv88e6xxx: reorder 88E6141 definitions



The related mv88e6xxx_ops and mv88e6xxx_info structure were misplaced.
Reorder them correctly to fix this.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c552a50e

drivers/net/dsa/mv88e6xxx/chip.c

+46 −46

Original line number	Diff line number	Diff line
		@@ -2944,6 +2944,37 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {
		.reset = mv88e6185_g1_reset,
		};

		static const struct mv88e6xxx_ops mv88e6141_ops = {
		/* MV88E6XXX_FAMILY_6341 */
		.get_eeprom = mv88e6xxx_g2_get_eeprom8,
		.set_eeprom = mv88e6xxx_g2_set_eeprom8,
		.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
		.phy_read = mv88e6xxx_g2_smi_phy_read,
		.phy_write = mv88e6xxx_g2_smi_phy_write,
		.port_set_link = mv88e6xxx_port_set_link,
		.port_set_duplex = mv88e6xxx_port_set_duplex,
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390_port_set_speed,
		.port_tag_remap = mv88e6095_port_tag_remap,
		.port_set_frame_mode = mv88e6351_port_set_frame_mode,
		.port_set_egress_floods = mv88e6352_port_set_egress_floods,
		.port_set_ether_type = mv88e6351_port_set_ether_type,
		.port_jumbo_config = mv88e6165_port_jumbo_config,
		.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,
		.port_pause_config = mv88e6097_port_pause_config,
		.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
		.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6320_stats_get_sset_count,
		.stats_get_strings = mv88e6320_stats_get_strings,
		.stats_get_stats = mv88e6390_stats_get_stats,
		.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,
		.g1_set_egress_port = mv88e6390_g1_set_egress_port,
		.watchdog_ops = &mv88e6390_watchdog_ops,
		.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,
		.reset = mv88e6352_g1_reset,
		};

		static const struct mv88e6xxx_ops mv88e6161_ops = {
		/* MV88E6XXX_FAMILY_6165 */
		.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
		@@ -3436,37 +3467,6 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
		.reset = mv88e6352_g1_reset,
		};

		static const struct mv88e6xxx_ops mv88e6141_ops = {
		/* MV88E6XXX_FAMILY_6341 */
		.get_eeprom = mv88e6xxx_g2_get_eeprom8,
		.set_eeprom = mv88e6xxx_g2_set_eeprom8,
		.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
		.phy_read = mv88e6xxx_g2_smi_phy_read,
		.phy_write = mv88e6xxx_g2_smi_phy_write,
		.port_set_link = mv88e6xxx_port_set_link,
		.port_set_duplex = mv88e6xxx_port_set_duplex,
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390_port_set_speed,
		.port_tag_remap = mv88e6095_port_tag_remap,
		.port_set_frame_mode = mv88e6351_port_set_frame_mode,
		.port_set_egress_floods = mv88e6352_port_set_egress_floods,
		.port_set_ether_type = mv88e6351_port_set_ether_type,
		.port_jumbo_config = mv88e6165_port_jumbo_config,
		.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,
		.port_pause_config = mv88e6097_port_pause_config,
		.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
		.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6320_stats_get_sset_count,
		.stats_get_strings = mv88e6320_stats_get_strings,
		.stats_get_stats = mv88e6390_stats_get_stats,
		.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,
		.g1_set_egress_port = mv88e6390_g1_set_egress_port,
		.watchdog_ops = &mv88e6390_watchdog_ops,
		.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,
		.reset = mv88e6352_g1_reset,
		};

		static const struct mv88e6xxx_ops mv88e6341_ops = {
		/* MV88E6XXX_FAMILY_6341 */
		.get_eeprom = mv88e6xxx_g2_get_eeprom8,
		@@ -3674,6 +3674,21 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.ops = &mv88e6131_ops,
		},

		[MV88E6141] = {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6141,
		.family = MV88E6XXX_FAMILY_6341,
		.name = "Marvell 88E6341",
		.num_databases = 4096,
		.num_ports = 6,
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 3750,
		.atu_move_port_mask = 0x1f,
		.tag_protocol = DSA_TAG_PROTO_EDSA,
		.flags = MV88E6XXX_FLAGS_FAMILY_6341,
		.ops = &mv88e6141_ops,
		},

		[MV88E6161] = {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6161,
		.family = MV88E6XXX_FAMILY_6165,
		@@ -3898,21 +3913,6 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.ops = &mv88e6321_ops,
		},

		[MV88E6141] = {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6141,
		.family = MV88E6XXX_FAMILY_6341,
		.name = "Marvell 88E6341",
		.num_databases = 4096,
		.num_ports = 6,
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 3750,
		.atu_move_port_mask = 0x1f,
		.tag_protocol = DSA_TAG_PROTO_EDSA,
		.flags = MV88E6XXX_FLAGS_FAMILY_6341,
		.ops = &mv88e6141_ops,
		},

		[MV88E6341] = {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6341,
		.family = MV88E6XXX_FAMILY_6341,