Skip to content

Commit

Permalink
net: marvell: prestera: fix uninitialized vid in prestera_port_vlans_add
Browse files Browse the repository at this point in the history
prestera_bridge_port_vlan_add should have been called with vlan->vid,
however this was masked by the presence of the local vid variable and I
did not notice the build warning.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: b7a9e0d ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Taras Chornyi <tchornyi@marvell.com>
Link: https://lore.kernel.org/r/20210114083556.2274440-1-olteanv@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Vladimir Oltean authored and Jakub Kicinski committed Jan 15, 2021
1 parent a5317f3 commit c612fe7
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,6 @@ static int prestera_port_vlans_add(struct prestera_port *port,
struct prestera_bridge_port *br_port;
struct prestera_switch *sw = port->sw;
struct prestera_bridge *bridge;
u16 vid;

if (netif_is_bridge_master(dev))
return 0;
Expand All @@ -1021,7 +1020,7 @@ static int prestera_port_vlans_add(struct prestera_port *port,
return 0;

return prestera_bridge_port_vlan_add(port, br_port,
vid, flag_untagged,
vlan->vid, flag_untagged,
flag_pvid, extack);
}

Expand Down

0 comments on commit c612fe7

Please sign in to comment.