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

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

Merge branch 'dsa-loop-fixes' 



Florian Fainelli says:

====================
net: dsa: Mock-up driver couple fixes

Thanks to Dan's static checker, a bunch of small issues were found in the code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 91e91bef d1db799e

drivers/net/dsa/dsa_loop.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port, 
	struct dsa_loop_priv *ps = ds->priv;

	struct mii_bus *bus = ps->bus;

	struct dsa_loop_vlan *vl;

	u16 vid, pvid;

	u16 vid, pvid = ps->pvid;



	dev_dbg(ds->dev, "%s\n", __func__);
@@ -194,7 +194,7 @@ static int dsa_loop_port_vlan_dump(struct dsa_switch *ds, int port, 
	struct mii_bus *bus = ps->bus;

	struct dsa_loop_vlan *vl;

	u16 vid, vid_start = 0;

	int err;

	int err = 0;



	dev_dbg(ds->dev, "%s\n", __func__);