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

Commit 10020414 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa' 



Florian Fainelli says:

====================
These two patches are non-critical bugfixes based on net-next which I
stumbled upon while working on Device Tree bindings for DSA (will comme
as a separate patch later).

====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 441d9d32 f9bf5a2c

net/dsa/dsa.c

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, 
	int ret;

	char *name;

	int i;

	bool valid_name_found = false;



	/*

	 * Probe for switch model.
@@ -131,8 +132,13 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, 
		} else {

			ds->phys_port_mask |= 1 << i;

		}

		valid_name_found = true;

	}



	if (!valid_name_found && i == DSA_MAX_PORTS) {

		ret = -EINVAL;

		goto out;

	}



	/*

	 * If the CPU connects to this switch, set the switch tree

net/dsa/slave.c

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds) 
	ds->slave_mii_bus->name = "dsa slave smi";

	ds->slave_mii_bus->read = dsa_slave_phy_read;

	ds->slave_mii_bus->write = dsa_slave_phy_write;

	snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "%s:%.2x",

			ds->master_mii_bus->id, ds->pd->sw_addr);

	snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d:%.2x",

			ds->index, ds->pd->sw_addr);

	ds->slave_mii_bus->parent = &ds->master_mii_bus->dev;

}