diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
| commit | 08fb98f5bf95cef902fc30427b39617a6f6875c7 (patch) | |
| tree | d709cdc500b447bb957fd1e7fbc9073005b8ce8e /include/linux/mlx4 | |
| parent | 99aa22d0d8f70d9317727ab40c85b2ead740a6ca (diff) | |
| parent | a017f583ec87d40b06eee6a6beeabe879c8113dd (diff) | |
Merge branch 'linus' into x86/fpu, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/mlx4')
| -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 80dec87a94f8..d46a0e7f144d 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -466,6 +466,7 @@ enum { enum { MLX4_INTERFACE_STATE_UP = 1 << 0, MLX4_INTERFACE_STATE_DELETION = 1 << 1, + MLX4_INTERFACE_STATE_SHUTDOWN = 1 << 2, }; #define MSTR_SM_CHANGE_MASK (MLX4_EQ_PORT_INFO_MSTR_SM_SL_CHANGE_MASK | \ |