diff options
Diffstat (limited to 'include/linux/mlx4')
| -rw-r--r-- | include/linux/mlx4/cmd.h | 1 | ||||
| -rw-r--r-- | include/linux/mlx4/device.h | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h index cf9c679ab38b..0f82293a82ed 100644 --- a/include/linux/mlx4/cmd.h +++ b/include/linux/mlx4/cmd.h | |||
| @@ -55,6 +55,7 @@ enum { | |||
| 55 | MLX4_CMD_CLOSE_PORT = 0xa, | 55 | MLX4_CMD_CLOSE_PORT = 0xa, |
| 56 | MLX4_CMD_QUERY_HCA = 0xb, | 56 | MLX4_CMD_QUERY_HCA = 0xb, |
| 57 | MLX4_CMD_QUERY_PORT = 0x43, | 57 | MLX4_CMD_QUERY_PORT = 0x43, |
| 58 | MLX4_CMD_SENSE_PORT = 0x4d, | ||
| 58 | MLX4_CMD_SET_PORT = 0xc, | 59 | MLX4_CMD_SET_PORT = 0xc, |
| 59 | MLX4_CMD_ACCESS_DDR = 0x2e, | 60 | MLX4_CMD_ACCESS_DDR = 0x2e, |
| 60 | MLX4_CMD_MAP_ICM = 0xffa, | 61 | MLX4_CMD_MAP_ICM = 0xffa, |
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 8f659cc29960..3aff8a6a389e 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h | |||
| @@ -155,8 +155,9 @@ enum mlx4_qp_region { | |||
| 155 | }; | 155 | }; |
| 156 | 156 | ||
| 157 | enum mlx4_port_type { | 157 | enum mlx4_port_type { |
| 158 | MLX4_PORT_TYPE_IB = 1 << 0, | 158 | MLX4_PORT_TYPE_IB = 1, |
| 159 | MLX4_PORT_TYPE_ETH = 1 << 1, | 159 | MLX4_PORT_TYPE_ETH = 2, |
| 160 | MLX4_PORT_TYPE_AUTO = 3 | ||
| 160 | }; | 161 | }; |
| 161 | 162 | ||
| 162 | enum mlx4_special_vlan_idx { | 163 | enum mlx4_special_vlan_idx { |
| @@ -237,6 +238,7 @@ struct mlx4_caps { | |||
| 237 | enum mlx4_port_type port_type[MLX4_MAX_PORTS + 1]; | 238 | enum mlx4_port_type port_type[MLX4_MAX_PORTS + 1]; |
| 238 | u8 supported_type[MLX4_MAX_PORTS + 1]; | 239 | u8 supported_type[MLX4_MAX_PORTS + 1]; |
| 239 | u32 port_mask; | 240 | u32 port_mask; |
| 241 | enum mlx4_port_type possible_type[MLX4_MAX_PORTS + 1]; | ||
| 240 | }; | 242 | }; |
| 241 | 243 | ||
| 242 | struct mlx4_buf_list { | 244 | struct mlx4_buf_list { |
