diff options
| author | Maxim Mikityanskiy | 2019-06-26 16:35:35 +0200 |
|---|---|---|
| committer | Daniel Borkmann | 2019-06-27 22:53:28 +0200 |
| commit | a011b49f4ed7813777a15da12a426ab939c58f14 (patch) | |
| tree | 1d8529bdc872a9bae18caa591604f7c11b82752b /drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |
| parent | net/mlx5e: XDP_TX from UMEM support (diff) | |
| download | kernel-qcow2-linux-a011b49f4ed7813777a15da12a426ab939c58f14.tar.gz kernel-qcow2-linux-a011b49f4ed7813777a15da12a426ab939c58f14.tar.xz kernel-qcow2-linux-a011b49f4ed7813777a15da12a426ab939c58f14.zip | |
net/mlx5e: Consider XSK in XDP MTU limit calculation
Use the existing mlx5e_get_linear_rq_headroom function to calculate the
headroom for mlx5e_xdp_max_mtu. This function takes the XSK headroom
into consideration, which will be used in the following patches.
Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Acked-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index abc1d0f6cf53..96fb3fa32d63 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3722,7 +3722,7 @@ int mlx5e_change_mtu(struct net_device *netdev, int new_mtu, if (params->xdp_prog && !mlx5e_rx_is_linear_skb(&new_channels.params)) { netdev_err(netdev, "MTU(%d) > %d is not allowed while XDP enabled\n", - new_mtu, mlx5e_xdp_max_mtu(params)); + new_mtu, mlx5e_xdp_max_mtu(params, NULL)); err = -EINVAL; goto out; } @@ -4167,7 +4167,7 @@ static int mlx5e_xdp_allowed(struct mlx5e_priv *priv, struct bpf_prog *prog) if (!mlx5e_rx_is_linear_skb(&new_channels.params)) { netdev_warn(netdev, "XDP is not allowed with MTU(%d) > %d\n", new_channels.params.sw_mtu, - mlx5e_xdp_max_mtu(&new_channels.params)); + mlx5e_xdp_max_mtu(&new_channels.params, NULL)); return -EINVAL; } |