diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:19:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:19:52 +0100 |
| commit | d01bd6fdb3be2f6cec1d5918e20175adca97615b (patch) | |
| tree | 7d5196a198ccb77b43dfbfea8f2492966b3adf76 /drivers/net/ethernet/mellanox/mlx4/mlx4.h | |
| parent | f056113faf553e166cb54bd6d1fe4f4b82c27568 (diff) | |
| parent | 5e9a2a3622d30c36814ea4df359c83dde1bf53a5 (diff) | |
Merge tag 'v3.10.46' into linux-linaro-lsk
This is the 3.10.46 stable release
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index df15bb6631cc..da4f0002fd27 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h @@ -743,6 +743,7 @@ struct mlx4_priv { spinlock_t ctx_lock; int pci_dev_data; + int removed; struct list_head pgdir_list; struct mutex pgdir_mutex; |