diff options
author | Doug Ledford | 2017-08-25 02:25:15 +0200 |
---|---|---|
committer | Doug Ledford | 2017-08-25 02:25:15 +0200 |
commit | a1139697adac394ce1fb06410b914f070b314f64 (patch) | |
tree | 34beeb4d2030ac0c6accadedadde2b8b6fb23002 /drivers/infiniband/sw | |
parent | RDMA/i40iw: Remove unused argument (diff) | |
parent | IB/mlx5: Report mlx5 enhanced multi packet WQE capability (diff) | |
download | kernel-qcow2-linux-a1139697adac394ce1fb06410b914f070b314f64.tar.gz kernel-qcow2-linux-a1139697adac394ce1fb06410b914f070b314f64.tar.xz kernel-qcow2-linux-a1139697adac394ce1fb06410b914f070b314f64.zip |
Merge branch 'mellanox' into k.o/for-next
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/sw')
-rw-r--r-- | drivers/infiniband/sw/rxe/rxe_hw_counters.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_hw_counters.c b/drivers/infiniband/sw/rxe/rxe_hw_counters.c index 7ef90aad7dfd..6aeb7a165e46 100644 --- a/drivers/infiniband/sw/rxe/rxe_hw_counters.c +++ b/drivers/infiniband/sw/rxe/rxe_hw_counters.c @@ -33,7 +33,7 @@ #include "rxe.h" #include "rxe_hw_counters.h" -const char * const rxe_counter_name[] = { +static const char * const rxe_counter_name[] = { [RXE_CNT_SENT_PKTS] = "sent_pkts", [RXE_CNT_RCVD_PKTS] = "rcvd_pkts", [RXE_CNT_DUP_REQ] = "duplicate_request", |