diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 16:53:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 16:53:53 -0500 |
| commit | c15cb37cc4e9809624411333b96109ddf770e29c (patch) | |
| tree | 3d4dbb48d97d5df9096ad815b99b20660cdc1bbf /include/linux/mlx4/device.h | |
| parent | 77be80e437fec44f8b7a620314b7d7b605b8d93b (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
Merge commit 'v2.6.28-rc8' into x86/uv
Diffstat (limited to 'include/linux/mlx4/device.h')
| -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 bd9977b89490..371086fd946f 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h | |||
| @@ -179,6 +179,7 @@ struct mlx4_caps { | |||
| 179 | int num_ports; | 179 | int num_ports; |
| 180 | int vl_cap[MLX4_MAX_PORTS + 1]; | 180 | int vl_cap[MLX4_MAX_PORTS + 1]; |
| 181 | int ib_mtu_cap[MLX4_MAX_PORTS + 1]; | 181 | int ib_mtu_cap[MLX4_MAX_PORTS + 1]; |
| 182 | __be32 ib_port_def_cap[MLX4_MAX_PORTS + 1]; | ||
| 182 | u64 def_mac[MLX4_MAX_PORTS + 1]; | 183 | u64 def_mac[MLX4_MAX_PORTS + 1]; |
| 183 | int eth_mtu_cap[MLX4_MAX_PORTS + 1]; | 184 | int eth_mtu_cap[MLX4_MAX_PORTS + 1]; |
| 184 | int gid_table_len[MLX4_MAX_PORTS + 1]; | 185 | int gid_table_len[MLX4_MAX_PORTS + 1]; |