diff options
| author | David S. Miller <[email protected]> | 2016-11-28 15:33:47 -0500 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-11-28 15:33:47 -0500 |
| commit | 2fc8d112d73f604936712c02780b9a8fb402b67c (patch) | |
| tree | f2c496beb7a6d0ed0c59c77f2942c008cdf47528 /include/linux | |
| parent | faa1fa54fd25a59a6c4b731ac652a2b7cd21ace8 (diff) | |
| parent | 44b911e77793d686b481608770d0c55c18055ba0 (diff) | |
Merge branch 'mlx4-fixes'
Tariq Toukan says:
====================
mlx4 bug fixes for 4.9
This patchset includes 2 bug fixes:
* In patch 1 we revert the commit that avoids invoking unregister_netdev
in shutdown flow, as it introduces netdev presence issues where
it can be accessed unsafely by ndo operations during the flow.
* Patch 2 is a simple fix for a variable uninitialization issue.
Series generated against net commit:
6998cc6ec237 tipc: resolve connection flow control compatibility problem
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/device.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 3be7abd6e722..c9f379689dd0 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -476,7 +476,6 @@ 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 | \ |