diff options
| author | Moshe Shemesh | 2018-07-29 12:29:45 +0200 |
|---|---|---|
| committer | Saeed Mahameed | 2018-08-13 21:50:17 +0200 |
| commit | 6dbc80ca41f5a76e0d2ae4e96b2476d68a2ea17f (patch) | |
| tree | 21fdc608cbe20d3cec4c79df6c267d33cf4bc41b /drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |
| parent | net/mlx5e: vxlan.c depends on CONFIG_VXLAN (diff) | |
| download | kernel-qcow2-linux-6dbc80ca41f5a76e0d2ae4e96b2476d68a2ea17f.tar.gz kernel-qcow2-linux-6dbc80ca41f5a76e0d2ae4e96b2476d68a2ea17f.tar.xz kernel-qcow2-linux-6dbc80ca41f5a76e0d2ae4e96b2476d68a2ea17f.zip | |
net/mlx5e: clock.c depends on CONFIG_PTP_1588_CLOCK
lib/clock.c includes clock related functions which require ptp support.
Thus compile out lib/clock.c and add the needed function stubs in case
kconfig CONFIG_PTP_1588_CLOCK is off.
Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
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, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index e09086f41365..5a7939e70190 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -46,6 +46,7 @@ #include "accel/ipsec.h" #include "accel/tls.h" #include "lib/vxlan.h" +#include "lib/clock.h" #include "en/port.h" #include "en/xdp.h" @@ -3782,7 +3783,8 @@ int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr) struct hwtstamp_config config; int err; - if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz)) + if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz) || + (mlx5_clock_get_ptp_index(priv->mdev) == -1)) return -EOPNOTSUPP; if (copy_from_user(&config, ifr->ifr_data, sizeof(config))) |