From: David S. Miller Date: Tue, 16 Feb 2021 22:53:30 +0000 (-0800) Subject: Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=44c32039751ad1506b188a8ffa8f1a7b9726d29e;p=linux.git Merge branch 'mlx5-next' of git://git./linux/kernel/git/mellanox/linux Saeed Mahameed says: ==================== pull-request: mlx5-next 2021-02-16 The patches in this pr are already submitted and reviewed through the netdev and rdma mailing lists. The series includes mlx5 HW bits and definitions for mlx5 real time clock translation and handling in the mlx5 driver clock module to enable and support such mode [1] [1] https://patchwork.kernel.org/project/netdevbpf/patch/20210212223042.449816-7-saeed@kernel.org/ ==================== Signed-off-by: David S. Miller --- 44c32039751ad1506b188a8ffa8f1a7b9726d29e diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h index a8e31cdd4a4ee,096e44d2ab4b1..7435fe6829b6b --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@@ -55,8 -55,8 +55,9 @@@ #include "en_stats.h" #include "en/dcbnl.h" #include "en/fs.h" +#include "en/qos.h" #include "lib/hv_vhca.h" + #include "lib/clock.h" extern const struct net_device_ops mlx5e_netdev_ops; struct page_pool; diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c index d3534b657b980,e40dec25cf6bd..c8866c14b8a37 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@@ -677,10 -653,11 +680,10 @@@ static void mlx5e_free_rq(struct mlx5e_ mlx5_wq_destroy(&rq->wq_ctrl); } -static int mlx5e_create_rq(struct mlx5e_rq *rq, - struct mlx5e_rq_param *param) +int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param) { struct mlx5_core_dev *mdev = rq->mdev; - + u8 ts_format; void *in; void *rqc; void *wq;