mlxsw: spectrum: Don't count on FID being present

Not all vPorts will have FIDs assigned to them, so make sure functions
first test for FID presence.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index ea007f021ec81c19eecb2ae95b121466f73b18e3..0c42515dcae4eae90e04c8be538e229ee65c4db9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3323,7 +3323,9 @@ mlxsw_sp_port_master_bridge_check(const struct mlxsw_sp_port *mlxsw_sp_port,
 
        list_for_each_entry(mlxsw_sp_vport, &mlxsw_sp_port->vports_list,
                            vport.list) {
-               if (mlxsw_sp_vport_br_get(mlxsw_sp_vport) == br_dev)
+               struct net_device *dev = mlxsw_sp_vport_br_get(mlxsw_sp_vport);
+
+               if (dev && dev == br_dev)
                        return false;
        }
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index a6dd295be5edca07961a88dfea7d83bd7545f675..f4195357ba91a177c841b864f0083f6b73ed2076 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -290,7 +290,7 @@ mlxsw_sp_vport_br_get(const struct mlxsw_sp_port *mlxsw_sp_vport)
 {
        struct mlxsw_sp_fid *f = mlxsw_sp_vport_fid_get(mlxsw_sp_vport);
 
-       return f->dev;
+       return f ? f->dev : NULL;
 }
 
 static inline struct mlxsw_sp_port *
@@ -317,7 +317,7 @@ mlxsw_sp_port_vport_find_by_fid(const struct mlxsw_sp_port *mlxsw_sp_port,
                            vport.list) {
                struct mlxsw_sp_fid *f = mlxsw_sp_vport_fid_get(mlxsw_sp_vport);
 
-               if (f->fid == fid)
+               if (f && f->fid == fid)
                        return mlxsw_sp_vport;
        }
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index b31b2ce0f1ed7425dac2ac70d54aee0c9c589a92..fc34c4691f81384c2b1c0d930f1f22d7b556e96c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -55,10 +55,10 @@
 static u16 mlxsw_sp_port_vid_to_fid_get(struct mlxsw_sp_port *mlxsw_sp_port,
                                        u16 vid)
 {
+       struct mlxsw_sp_fid *f = mlxsw_sp_vport_fid_get(mlxsw_sp_port);
        u16 fid = vid;
 
-       if (mlxsw_sp_port_is_vport(mlxsw_sp_port))
-               fid = mlxsw_sp_vport_fid_get(mlxsw_sp_port)->fid;
+       fid = f ? f->fid : fid;
 
        if (!fid)
                fid = mlxsw_sp_port->pvid;
@@ -1196,7 +1196,8 @@ static int mlxsw_sp_port_fdb_dump(struct mlxsw_sp_port *mlxsw_sp_port,
 {
        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
        struct mlxsw_sp_port *tmp;
-       u16 vport_fid = 0;
+       struct mlxsw_sp_fid *f;
+       u16 vport_fid;
        char *sfd_pl;
        char mac[ETH_ALEN];
        u16 fid;
@@ -1211,8 +1212,8 @@ static int mlxsw_sp_port_fdb_dump(struct mlxsw_sp_port *mlxsw_sp_port,
        if (!sfd_pl)
                return -ENOMEM;
 
-       if (mlxsw_sp_port_is_vport(mlxsw_sp_port))
-               vport_fid = mlxsw_sp_vport_fid_get(mlxsw_sp_port)->fid;
+       f = mlxsw_sp_vport_fid_get(mlxsw_sp_port);
+       vport_fid = f ? f->fid : 0;
 
        mlxsw_reg_sfd_pack(sfd_pl, MLXSW_REG_SFD_OP_QUERY_DUMP, 0);
        do {