diff options
| author | Shaker Daibes | 2016-12-10 17:45:55 +0100 |
|---|---|---|
| committer | Saeed Mahameed | 2017-01-24 20:14:08 +0100 |
| commit | 5eb0249b4352c813f0a3c31b967f6cb4b9869a50 (patch) | |
| tree | d240459f684095c7dc881c7573c153a4ceea3968 /drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | |
| parent | net/mlx5e: Reduce memory consumption on kdump kernel (diff) | |
| download | kernel-qcow2-linux-5eb0249b4352c813f0a3c31b967f6cb4b9869a50.tar.gz kernel-qcow2-linux-5eb0249b4352c813f0a3c31b967f6cb4b9869a50.tar.xz kernel-qcow2-linux-5eb0249b4352c813f0a3c31b967f6cb4b9869a50.zip | |
net/mlx5e: CQE compression control code reuse
This patch is intended for code reuse of mlx5e_modify_rx_cqe_compression
function.
Signed-off-by: Shaker Daibes <shakerd@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_clock.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c b/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c index 349dc72cd2b6..37e66eef6fb5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c @@ -106,11 +106,12 @@ int mlx5e_hwstamp_set(struct net_device *dev, struct ifreq *ifr) return -ERANGE; } + mutex_lock(&priv->state_lock); /* RX HW timestamp */ switch (config.rx_filter) { case HWTSTAMP_FILTER_NONE: /* Reset CQE compression to Admin default */ - mlx5e_modify_rx_cqe_compression(priv, priv->params.rx_cqe_compress_def); + mlx5e_modify_rx_cqe_compression_locked(priv, priv->params.rx_cqe_compress_def); break; case HWTSTAMP_FILTER_ALL: case HWTSTAMP_FILTER_SOME: @@ -128,14 +129,16 @@ int mlx5e_hwstamp_set(struct net_device *dev, struct ifreq *ifr) case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ: /* Disable CQE compression */ netdev_warn(dev, "Disabling cqe compression"); - mlx5e_modify_rx_cqe_compression(priv, false); + mlx5e_modify_rx_cqe_compression_locked(priv, false); config.rx_filter = HWTSTAMP_FILTER_ALL; break; default: + mutex_unlock(&priv->state_lock); return -ERANGE; } memcpy(&priv->tstamp.hwtstamp_config, &config, sizeof(config)); + mutex_unlock(&priv->state_lock); return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ? -EFAULT : 0; |