diff options
| author | Roland Dreier <rolandd@cisco.com> | 2008-12-01 10:11:50 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-12-01 10:11:50 -0800 |
| commit | b0f43dcca8a1f46e17b26d10f3cb1b297ebfb44e (patch) | |
| tree | b1e3ef2a96f22fe9848281d0ad2701b0c5fc6f7e /include | |
| parent | 7ec4f4634a4326c1f8fd172c80c8f59c9b3e90a4 (diff) | |
| parent | 42ab01c31526ac1d06d193f81a498bf3cf2acfe4 (diff) | |
| download | linux-b0f43dcca8a1f46e17b26d10f3cb1b297ebfb44e.tar.gz linux-b0f43dcca8a1f46e17b26d10f3cb1b297ebfb44e.tar.bz2 linux-b0f43dcca8a1f46e17b26d10f3cb1b297ebfb44e.zip | |
Merge branches 'ehca' and 'mlx4' into for-linus
Diffstat (limited to 'include')
| -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 { int num_ports; int vl_cap[MLX4_MAX_PORTS + 1]; int ib_mtu_cap[MLX4_MAX_PORTS + 1]; + __be32 ib_port_def_cap[MLX4_MAX_PORTS + 1]; u64 def_mac[MLX4_MAX_PORTS + 1]; int eth_mtu_cap[MLX4_MAX_PORTS + 1]; int gid_table_len[MLX4_MAX_PORTS + 1]; |