diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-22 16:38:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-22 16:38:17 -0400 |
| commit | acd43fe85b2d1dbad55ce211b8817e6d6687246f (patch) | |
| tree | 58119d9fbb3bfae0856da104657aad7d3dcf59f7 /include | |
| parent | 27777daa8b6df0c19aaf591d1536a586b3eb5e36 (diff) | |
| parent | 9d76931180557270796f9631e2c79b9c7bb3c9fb (diff) | |
Merge branch 'mlx4-fixes'
Tariq Toukan says:
====================
mlx4_en fixes for 4.7-rc
This small patchset includes two small fixes for mlx4_en driver.
One allows a clean shutdown even when clients do not release their
netdev reference.
The other adds error return values to the VLAN VID add/kill functions.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 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 | \ |