diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-30 17:53:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-30 17:53:57 -0700 |
| commit | 4300c7e7fe152be96b41b2135e3ace9a1e8db308 (patch) | |
| tree | 6317281b4933c74b8716ed6e01dbf4d67d8f8a6d /drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c | |
| parent | Merge branch 'hns3-next' (diff) | |
| parent | net/mlx5e: Make mlx5e_dcbnl_ops static (diff) | |
| download | wireguard-linux-4300c7e7fe152be96b41b2135e3ace9a1e8db308.tar.xz wireguard-linux-4300c7e7fe152be96b41b2135e3ace9a1e8db308.zip | |
Merge tag 'mlx5-cleanup-2020-05-29' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-cleanup-2020-05-29
Accumulated cleanup patches and sparse warning fixes for mlx5 driver.
1) sync with mlx5-next branch
2) Eli Cohen declares mpls_entry_encode() helper in mpls.h as suggested
by Jakub Kicinski and David Ahern, and use it in mlx5
3) Jesper Fixes xdp data_meta setup in mlx5
4) Many sparse and build warnings cleanup
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c b/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c index cab708af3422..cbf3d76c05a8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c @@ -56,8 +56,8 @@ void mlx5_accel_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid, mlx5_fpga_tls_del_flow(mdev, swid, GFP_KERNEL, direction_sx); } -int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq, - u64 rcd_sn) +int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle, + u32 seq, __be64 rcd_sn) { return mlx5_fpga_tls_resync_rx(mdev, handle, seq, rcd_sn); } |