Commit c7e856c8 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by David S. Miller
Browse files

dpaa2-switch: move the dpaa2_switch_fdb_set_egress_flood function 



In order to avoid a forward declaration in the next patches, move the
dpaa2_switch_fdb_set_egress_flood() function to the top of the file.

Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3adffc76

drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c

+42 −42
Original line number Diff line number Diff line
@@ -110,6 +110,48 @@ static u16 dpaa2_switch_port_set_fdb(struct ethsw_port_priv *port_priv, 
	return 0;

}



static int dpaa2_switch_fdb_set_egress_flood(struct ethsw_core *ethsw, u16 fdb_id)

{

	struct dpsw_egress_flood_cfg flood_cfg;

	int i = 0, j;

	int err;



	/* Add all the DPAA2 switch ports found in the same bridging domain to

	 * the egress flooding domain

	 */

	for (j = 0; j < ethsw->sw_attr.num_ifs; j++)

		if (ethsw->ports[j] && ethsw->ports[j]->fdb->fdb_id == fdb_id)

			flood_cfg.if_id[i++] = ethsw->ports[j]->idx;



	/* Add the CTRL interface to the egress flooding domain */

	flood_cfg.if_id[i++] = ethsw->sw_attr.num_ifs;



	/* Use the FDB of the first dpaa2 switch port added to the bridge */

	flood_cfg.fdb_id = fdb_id;



	/* Setup broadcast flooding domain */

	flood_cfg.flood_type = DPSW_BROADCAST;

	flood_cfg.num_ifs = i;

	err = dpsw_set_egress_flood(ethsw->mc_io, 0, ethsw->dpsw_handle,

				    &flood_cfg);

	if (err) {

		dev_err(ethsw->dev, "dpsw_set_egress_flood() = %d\n", err);

		return err;

	}



	/* Setup unknown flooding domain */

	flood_cfg.flood_type = DPSW_FLOODING;

	flood_cfg.num_ifs = i;

	err = dpsw_set_egress_flood(ethsw->mc_io, 0, ethsw->dpsw_handle,

				    &flood_cfg);

	if (err) {

		dev_err(ethsw->dev, "dpsw_set_egress_flood() = %d\n", err);

		return err;

	}



	return 0;

}



static void *dpaa2_iova_to_virt(struct iommu_domain *domain,

				dma_addr_t iova_addr)

{
@@ -1442,48 +1484,6 @@ static int dpaa2_switch_port_attr_set_event(struct net_device *netdev, 
	return notifier_from_errno(err);

}



static int dpaa2_switch_fdb_set_egress_flood(struct ethsw_core *ethsw, u16 fdb_id)

{

	struct dpsw_egress_flood_cfg flood_cfg;

	int i = 0, j;

	int err;



	/* Add all the DPAA2 switch ports found in the same bridging domain to

	 * the egress flooding domain

	 */

	for (j = 0; j < ethsw->sw_attr.num_ifs; j++)

		if (ethsw->ports[j] && ethsw->ports[j]->fdb->fdb_id == fdb_id)

			flood_cfg.if_id[i++] = ethsw->ports[j]->idx;



	/* Add the CTRL interface to the egress flooding domain */

	flood_cfg.if_id[i++] = ethsw->sw_attr.num_ifs;



	/* Use the FDB of the first dpaa2 switch port added to the bridge */

	flood_cfg.fdb_id = fdb_id;



	/* Setup broadcast flooding domain */

	flood_cfg.flood_type = DPSW_BROADCAST;

	flood_cfg.num_ifs = i;

	err = dpsw_set_egress_flood(ethsw->mc_io, 0, ethsw->dpsw_handle,

				    &flood_cfg);

	if (err) {

		dev_err(ethsw->dev, "dpsw_set_egress_flood() = %d\n", err);

		return err;

	}



	/* Setup unknown flooding domain */

	flood_cfg.flood_type = DPSW_FLOODING;

	flood_cfg.num_ifs = i;

	err = dpsw_set_egress_flood(ethsw->mc_io, 0, ethsw->dpsw_handle,

				    &flood_cfg);

	if (err) {

		dev_err(ethsw->dev, "dpsw_set_egress_flood() = %d\n", err);

		return err;

	}



	return 0;

}



static int dpaa2_switch_port_bridge_join(struct net_device *netdev,

					 struct net_device *upper_dev)

{