Page MenuHomeFreeBSD
Files F159567756

D4941.id12314.diff
No OneTemporary
Actions

D4941.id12314.diff
View Options

Index: sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
===================================================================
--- sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
+++ sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
@@ -178,23 +178,21 @@
priv->params.tx_cq_moderation_mode = priv->params_ethtool.tx_coalesce_mode;
/* we always agree to turn off HW LRO - but not always to turn on */
- if (priv->params_ethtool.hw_lro) {
- if (priv->params_ethtool.hw_lro != 1) {
- priv->params_ethtool.hw_lro = priv->params.hw_lro_en;
- error = EINVAL;
- goto done;
- }
- if (priv->ifp->if_capenable & IFCAP_LRO)
- priv->params.hw_lro_en = !!MLX5_CAP_ETH(priv->mdev, lro_cap);
- else {
- /* set the correct (0) value to params_ethtool.hw_lro, issue a warning and return error */
+ if (priv->params_ethtool.hw_lro != 0) {
+ if ((priv->ifp->if_capenable & IFCAP_LRO) &&
+ MLX5_CAP_ETH(priv->mdev, lro_cap)) {
+ priv->params.hw_lro_en = 1;
+ priv->params_ethtool.hw_lro = 1;
+ } else {
+ priv->params.hw_lro_en = 0;
priv->params_ethtool.hw_lro = 0;
error = EINVAL;
- if_printf(priv->ifp, "Can't set HW_LRO to a device with LRO turned off");
- goto done;
+
+ if_printf(priv->ifp, "Can't enable HW LRO: "
+ "The HW or SW LRO feature is disabled");
}
} else {
- priv->params.hw_lro_en = false;
+ priv->params.hw_lro_en = 0;
}
if (&priv->params_ethtool.arg[arg2] ==
@@ -208,7 +206,6 @@
priv->params_ethtool.cqe_zipping = 0;
}
}
-
if (was_opened)
mlx5e_open_locked(priv->ifp);
done:

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 16, 6:53 PM (8 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33998995
Default Alt Text
D4941.id12314.diff (1 KB)

Event Timeline