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

Commit e6f1960a authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Allocate FID according to PVID 



For bridge netdevices, instead of assuming that the router traffic is on
VLAN 1, look at the bridge PVID.

This patch assumes that the PVID doesn't change after the router
interface is created (i.e. after the IP address is assigned).

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f15e257

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+14 −1
Original line number Diff line number Diff line
@@ -6870,7 +6870,20 @@ static struct mlxsw_sp_fid * 
mlxsw_sp_rif_vlan_fid_get(struct mlxsw_sp_rif *rif,

			  struct netlink_ext_ack *extack)

{

	u16 vid = is_vlan_dev(rif->dev) ? vlan_dev_vlan_id(rif->dev) : 1;

	u16 vid;

	int err;



	if (is_vlan_dev(rif->dev)) {

		vid = vlan_dev_vlan_id(rif->dev);

	} else {

		err = br_vlan_get_pvid(rif->dev, &vid);

		if (!vid)

			err = -EINVAL;

		if (err) {

			NL_SET_ERR_MSG_MOD(extack, "Couldn't determine bridge PVID");

			return ERR_PTR(err);

		}

	}



	return mlxsw_sp_fid_8021q_get(rif->mlxsw_sp, vid);

}