diff options
| author | Amir Vadai <amirv@mellanox.com> | 2014-03-06 11:28:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-06 17:09:04 -0500 |
| commit | 57352ef4f5f19969a50d42e84b274287993b576f (patch) | |
| tree | 3d5977829a6edd48d542e59e82085e90b5c14162 /drivers/net | |
| parent | 5bd4e4c158ceb4e76ce9ed005c876d59caad8af2 (diff) | |
net/mlx4_core: Fix memory access error in mlx4_QUERY_DEV_CAP_wrapper()
Fix a regression introduced by [1]. outbox was accessed instead of
outbox->buf. Typo was copy-pasted to [2] and [3].
[1] - cc1ade9 mlx4_core: Disable memory windows for virtual functions
[2] - 4de6580 mlx4_core: Add support for steerable IB UD QPs
[3] - 7ffdf72 net/mlx4_core: Add basic support for TCP/IP offloads under
tunneling
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/fw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c index 91b69ff4b4a2..8726e34cee22 100644 --- a/drivers/net/ethernet/mellanox/mlx4/fw.c +++ b/drivers/net/ethernet/mellanox/mlx4/fw.c | |||
| @@ -859,7 +859,7 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave, | |||
| 859 | MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET); | 859 | MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET); |
| 860 | 860 | ||
| 861 | /* For guests, disable vxlan tunneling */ | 861 | /* For guests, disable vxlan tunneling */ |
| 862 | MLX4_GET(field, outbox, QUERY_DEV_CAP_VXLAN); | 862 | MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_VXLAN); |
| 863 | field &= 0xf7; | 863 | field &= 0xf7; |
| 864 | MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_VXLAN); | 864 | MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_VXLAN); |
| 865 | 865 | ||
| @@ -869,7 +869,7 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave, | |||
| 869 | MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_BF_OFFSET); | 869 | MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_BF_OFFSET); |
| 870 | 870 | ||
| 871 | /* For guests, disable mw type 2 */ | 871 | /* For guests, disable mw type 2 */ |
| 872 | MLX4_GET(bmme_flags, outbox, QUERY_DEV_CAP_BMME_FLAGS_OFFSET); | 872 | MLX4_GET(bmme_flags, outbox->buf, QUERY_DEV_CAP_BMME_FLAGS_OFFSET); |
| 873 | bmme_flags &= ~MLX4_BMME_FLAG_TYPE_2_WIN; | 873 | bmme_flags &= ~MLX4_BMME_FLAG_TYPE_2_WIN; |
| 874 | MLX4_PUT(outbox->buf, bmme_flags, QUERY_DEV_CAP_BMME_FLAGS_OFFSET); | 874 | MLX4_PUT(outbox->buf, bmme_flags, QUERY_DEV_CAP_BMME_FLAGS_OFFSET); |
| 875 | 875 | ||
| @@ -883,7 +883,7 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave, | |||
| 883 | } | 883 | } |
| 884 | 884 | ||
| 885 | /* turn off ipoib managed steering for guests */ | 885 | /* turn off ipoib managed steering for guests */ |
| 886 | MLX4_GET(field, outbox, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET); | 886 | MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET); |
| 887 | field &= ~0x80; | 887 | field &= ~0x80; |
| 888 | MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET); | 888 | MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_FLOW_STEERING_IPOIB_OFFSET); |
| 889 | 889 | ||
