Commit da6192ca authored by Will Mortensen's avatar Will Mortensen Committed by Paolo Abeni

net/mlx5e: Again mutually exclude RX-FCS and RX-port-timestamp

Commit 1e662209 ("net/mlx5e: Update rx ring hw mtu upon each rx-fcs
flag change") seems to have accidentally inverted the logic added in
commit 0bc73ad4 ("net/mlx5e: Mutually exclude RX-FCS and
RX-port-timestamp").

The impact of this is a little unclear since it seems the FCS scattered
with RX-FCS is (usually?) correct regardless.

Fixes: 1e662209 ("net/mlx5e: Update rx ring hw mtu upon each rx-fcs flag change")
Tested-by: default avatarCharlotte Tan <charlotte@extrahop.com>
Reviewed-by: default avatarCharlotte Tan <charlotte@extrahop.com>
Cc: Adham Faris <afaris@nvidia.com>
Cc: Aya Levin <ayal@nvidia.com>
Cc: Tariq Toukan <tariqt@nvidia.com>
Cc: Moshe Shemesh <moshe@nvidia.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarWill Mortensen <will@extrahop.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20231006053706.514618-1-will@extrahop.comSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent a72178cf
...@@ -3952,13 +3952,14 @@ static int set_feature_rx_fcs(struct net_device *netdev, bool enable) ...@@ -3952,13 +3952,14 @@ static int set_feature_rx_fcs(struct net_device *netdev, bool enable)
struct mlx5e_channels *chs = &priv->channels; struct mlx5e_channels *chs = &priv->channels;
struct mlx5e_params new_params; struct mlx5e_params new_params;
int err; int err;
bool rx_ts_over_crc = !enable;
mutex_lock(&priv->state_lock); mutex_lock(&priv->state_lock);
new_params = chs->params; new_params = chs->params;
new_params.scatter_fcs_en = enable; new_params.scatter_fcs_en = enable;
err = mlx5e_safe_switch_params(priv, &new_params, mlx5e_set_rx_port_ts_wrap, err = mlx5e_safe_switch_params(priv, &new_params, mlx5e_set_rx_port_ts_wrap,
&new_params.scatter_fcs_en, true); &rx_ts_over_crc, true);
mutex_unlock(&priv->state_lock); mutex_unlock(&priv->state_lock);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment