diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-10 16:08:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-10 16:08:26 -0400 |
| commit | 79a6fd232748c5ece3c20c04855d181d81bec348 (patch) | |
| tree | d6e90953f3fa7909085b88eaddf7273c84630317 /include/linux | |
| parent | a37fb855f6e8e9eafac046721393f68f48eb5f91 (diff) | |
| parent | e57328384b6a9148df653216203408de3be3dda1 (diff) | |
| download | cachepc-linux-79a6fd232748c5ece3c20c04855d181d81bec348.tar.gz cachepc-linux-79a6fd232748c5ece3c20c04855d181d81bec348.zip | |
Merge branch 'mlx4-misc-next'
Tariq Toukan says:
====================
mlx4_core misc for 4.18
This patchset contains misc enhancements from the team
to the mlx4 Core driver.
Patch 1 by Eran adds driver version report in FW.
Patch 2 by Yishai implements suspend/resume PCI callbacks.
Patch 3 extends the range of an existing module param from boolean to numerical.
Series generated against net-next commit:
53a7bdfb2a27 dt-bindings: dsa: Remove unnecessary #address/#size-cells
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 81d0799b6091..122e7e9d3091 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -225,6 +225,7 @@ enum { MLX4_DEV_CAP_FLAG2_SVLAN_BY_QP = 1ULL << 36, MLX4_DEV_CAP_FLAG2_SL_TO_VL_CHANGE_EVENT = 1ULL << 37, MLX4_DEV_CAP_FLAG2_USER_MAC_EN = 1ULL << 38, + MLX4_DEV_CAP_FLAG2_DRIVER_VERSION_TO_FW = 1ULL << 39, }; enum { |