| Message ID | 1551091207-10366-3-git-send-email-xiangxia.m.yue@gmail.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | net/mlx5e: Make little improvement for mlx5e | expand |
On 25/02/2019 12:40, xiangxia.m.yue@gmail.com wrote: > From: Tonghao Zhang <xiangxia.m.yue@gmail.com> > > If we try to offload decapsulation actions to VFs hw, we get the log [1]. > It's not friendly, because the kind of net device is null, and we don't > know what '0' means. > > [1] "mlx5_core 0000:05:01.2 vf_0: decapsulation offload is not supported for net device (0)" > > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c > index bdcc5e7..6cbfbfa 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c > @@ -84,7 +84,7 @@ static const char *mlx5e_netdev_kind(struct net_device *dev) > if (dev->rtnl_link_ops) > return dev->rtnl_link_ops->kind; > else > - return ""; > + return "unknown"; > } > > static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv, > @@ -620,8 +620,10 @@ int mlx5e_tc_tun_parse(struct net_device *filter_dev, > headers_c, headers_v); > } else { > netdev_warn(priv->netdev, > - "decapsulation offload is not supported for %s net device (%d)\n", > - mlx5e_netdev_kind(filter_dev), tunnel_type); > + "decapsulation offload is not supported for %s (kind: \"%s\")\n", > + netdev_name(filter_dev), > + mlx5e_netdev_kind(filter_dev)); > + > return -EOPNOTSUPP; > } > return err; > Reviewed-by: Roi Dayan <roid@mellanox.com>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c index bdcc5e7..6cbfbfa 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c @@ -84,7 +84,7 @@ static const char *mlx5e_netdev_kind(struct net_device *dev) if (dev->rtnl_link_ops) return dev->rtnl_link_ops->kind; else - return ""; + return "unknown"; } static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv, @@ -620,8 +620,10 @@ int mlx5e_tc_tun_parse(struct net_device *filter_dev, headers_c, headers_v); } else { netdev_warn(priv->netdev, - "decapsulation offload is not supported for %s net device (%d)\n", - mlx5e_netdev_kind(filter_dev), tunnel_type); + "decapsulation offload is not supported for %s (kind: \"%s\")\n", + netdev_name(filter_dev), + mlx5e_netdev_kind(filter_dev)); + return -EOPNOTSUPP; } return err;