Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / include / linux / mlx5 / device.h

diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 7031d655ec32c0cd9fbd85bbf0c798ad2bb8d01b..eaf4ad209c8fa9bb8859d6c7e0c4392f8f8c23aa 100644 (file)
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -290,6 +290,7 @@ enum mlx5_event {
        MLX5_EVENT_TYPE_GPIO_EVENT         = 0x15,
        MLX5_EVENT_TYPE_PORT_MODULE_EVENT  = 0x16,
        MLX5_EVENT_TYPE_REMOTE_CONFIG      = 0x19,
+       MLX5_EVENT_TYPE_GENERAL_EVENT      = 0x22,
        MLX5_EVENT_TYPE_PPS_EVENT          = 0x25,
 
        MLX5_EVENT_TYPE_DB_BF_CONGESTION   = 0x1a,
@@ -304,6 +305,10 @@ enum mlx5_event {
        MLX5_EVENT_TYPE_FPGA_ERROR         = 0x20,
 };
 
+enum {
+       MLX5_GENERAL_SUBTYPE_DELAY_DROP_TIMEOUT = 0x1,
+};
+
 enum {
        MLX5_PORT_CHANGE_SUBTYPE_DOWN           = 1,
        MLX5_PORT_CHANGE_SUBTYPE_ACTIVE         = 4,
@@ -968,7 +973,7 @@ enum mlx5_cap_type {
        MLX5_CAP_ATOMIC,
        MLX5_CAP_ROCE,
        MLX5_CAP_IPOIB_OFFLOADS,
-       MLX5_CAP_EOIB_OFFLOADS,
+       MLX5_CAP_IPOIB_ENHANCED_OFFLOADS,
        MLX5_CAP_FLOW_TABLE,
        MLX5_CAP_ESWITCH_FLOW_TABLE,
        MLX5_CAP_ESWITCH,
@@ -1011,6 +1016,10 @@ enum mlx5_mcam_feature_groups {
        MLX5_GET(per_protocol_networking_offload_caps,\
                 mdev->caps.hca_max[MLX5_CAP_ETHERNET_OFFLOADS], cap)
 
+#define MLX5_CAP_IPOIB_ENHANCED(mdev, cap) \
+       MLX5_GET(per_protocol_networking_offload_caps,\
+                mdev->caps.hca_cur[MLX5_CAP_IPOIB_ENHANCED_OFFLOADS], cap)
+
 #define MLX5_CAP_ROCE(mdev, cap) \
        MLX5_GET(roce_cap, mdev->caps.hca_cur[MLX5_CAP_ROCE], cap)