| Message ID | 4ee5fbea-7807-42dd-a9b8-738ac23249d0@moroto.mountain (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [net] net/mlx5: Fix a NULL vs IS_ERR() check | expand |
On 03.11.2023 07:36, Dan Carpenter wrote: > The mlx5_esw_offloads_devlink_port() function returns error pointers, not > NULL. > > Fixes: 7bef147a6ab6 ("net/mlx5: Don't skip vport check") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > I *think* these normally go through the mellanox tree and not net. Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com> > > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c > index 693e55b010d9..5c569d4bfd00 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c > @@ -1493,7 +1493,7 @@ mlx5e_vport_vf_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) > > dl_port = mlx5_esw_offloads_devlink_port(dev->priv.eswitch, > rpriv->rep->vport); > - if (dl_port) { > + if (!IS_ERR(dl_port)) { > SET_NETDEV_DEVLINK_PORT(netdev, dl_port); > mlx5e_rep_vnic_reporter_create(priv, dl_port); > }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 693e55b010d9..5c569d4bfd00 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -1493,7 +1493,7 @@ mlx5e_vport_vf_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) dl_port = mlx5_esw_offloads_devlink_port(dev->priv.eswitch, rpriv->rep->vport); - if (dl_port) { + if (!IS_ERR(dl_port)) { SET_NETDEV_DEVLINK_PORT(netdev, dl_port); mlx5e_rep_vnic_reporter_create(priv, dl_port); }
The mlx5_esw_offloads_devlink_port() function returns error pointers, not NULL. Fixes: 7bef147a6ab6 ("net/mlx5: Don't skip vport check") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- I *think* these normally go through the mellanox tree and not net. drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)