diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-21 22:02:41 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-21 22:02:41 +0300 |
| commit | 669c00c009ba0db81e840fd7e11faff7be8c8123 (patch) | |
| tree | d46447637b7bfd4d00a1fcd0d3fc370dd89a4fb7 /include | |
| parent | a1459c1c9ebcd72f3d488fd10673e64b2bfcbd27 (diff) | |
| parent | d21ed3a311a1031dddc78e9270d1aa9adc8f8a93 (diff) | |
| download | linux-669c00c009ba0db81e840fd7e11faff7be8c8123.tar.xz | |
Merge branch 'mlx4-fixes'
Or Gerlitz says:
====================
Mellaox 40G driver fixes for 4.6-rc
With the fix for ARM bug being under the works, these are
few other fixes for mlx4 we have ready to go.
Eran addressed the problematic/wrong reporting of dropped packets, Daniel
fixed some matters related to PPC EEH's and Jenny's patch makes sure
VFs can't change the port's pause settings.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mlx4/device.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 8541a913f6a3..d1f904c8b2cb 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -828,6 +828,11 @@ struct mlx4_vf_dev { u8 n_ports; }; +enum mlx4_pci_status { + MLX4_PCI_STATUS_DISABLED, + MLX4_PCI_STATUS_ENABLED, +}; + struct mlx4_dev_persistent { struct pci_dev *pdev; struct mlx4_dev *dev; @@ -841,6 +846,8 @@ struct mlx4_dev_persistent { u8 state; struct mutex interface_state_mutex; /* protect SW state */ u8 interface_state; + struct mutex pci_status_mutex; /* sync pci state */ + enum mlx4_pci_status pci_status; }; struct mlx4_dev { |