diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-31 12:49:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-31 12:49:10 -0500 |
| commit | 58d7553d5593292e1bdbfd6423b44caaca0799bd (patch) | |
| tree | ace64d0ccf89db5b59b596892ba5337aebcff3ec /include/linux | |
| parent | 1b13c97fae9c61dc20db8e0d0a72a29df29ac377 (diff) | |
| parent | 3484aac16149636f0ba5b5b0789a2918c682db7e (diff) | |
Merge branch 'mlx4'
Merge mlx4 bug fixes from Amir Vadai.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/device.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 20ea939c22a6..1883e8e84718 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -150,7 +150,8 @@ enum { MLX4_DEV_CAP_FLAG2_RSS = 1LL << 0, MLX4_DEV_CAP_FLAG2_RSS_TOP = 1LL << 1, MLX4_DEV_CAP_FLAG2_RSS_XOR = 1LL << 2, - MLX4_DEV_CAP_FLAG2_FS_EN = 1LL << 3 + MLX4_DEV_CAP_FLAG2_FS_EN = 1LL << 3, + MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN = 1LL << 4 }; enum { |