OSDN Git Service

Merge branch 'icrc-counter' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Fri, 22 Jun 2018 14:53:27 +0000 (08:53 -0600)
committerJason Gunthorpe <jgg@mellanox.com>
Fri, 22 Jun 2018 14:53:27 +0000 (08:53 -0600)
commit4d7dff2b8b24d0087c75afb8e53140acdd1dc2bd
treead4935b76e81ff0e19384274e3f80a75198f2bca
parentcfdeb8934b6f85f235071e9d3700756a0a12758d
parent9f876f3de6616f02960d7d88ad52c805946f4b63
Merge branch 'icrc-counter' into rdma.git for-next

For dependencies, branch based on 'mellanox/mlx5-next' of
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git

Pull RoCE ICRC counters from Leon Romanovsky:

====================
This series exposes RoCE ICRC counter through existing RDMA hw_counters
sysfs interface.

The first patch has all HW definitions in mlx5_ifc.h file and second patch
is the actual counter implementation.
====================

* branch 'icrc-counter':
  IB/mlx5: Support RoCE ICRC encapsulated error counter
  net/mlx5: Add RoCE RX ICRC encapsulated counter
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
include/linux/mlx5/mlx5_ifc.h