diff options
| author | Bjorn Helgaas | 2017-04-28 17:36:12 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2017-04-28 17:36:12 +0200 |
| commit | ef1b5dad5a386885998d11eb45ca7fd183079965 (patch) | |
| tree | f065b28a01dbe57ef28ace9b88dfbf9c2fe49b09 /drivers/pci/pci.h | |
| parent | Merge branch 'pci/resource-mmap' into next (diff) | |
| parent | ixgbe: Use pcie_flr() instead of duplicating it (diff) | |
| download | kernel-qcow2-linux-ef1b5dad5a386885998d11eb45ca7fd183079965.tar.gz kernel-qcow2-linux-ef1b5dad5a386885998d11eb45ca7fd183079965.tar.xz kernel-qcow2-linux-ef1b5dad5a386885998d11eb45ca7fd183079965.zip | |
Merge branch 'pci/virtualization' into next
* pci/virtualization:
ixgbe: Use pcie_flr() instead of duplicating it
IB/hfi1: Use pcie_flr() instead of duplicating it
PCI: Call pcie_flr() from reset_chelsio_generic_dev()
PCI: Call pcie_flr() from reset_intel_82599_sfp_virtfn()
PCI: Export pcie_flr()
PCI: Add sysfs sriov_drivers_autoprobe to control VF driver binding
PCI: Avoid FLR for Intel 82579 NICs
Conflicts:
include/linux/pci.h
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 71fa82359b5b..586e63f55013 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -272,6 +272,7 @@ struct pci_sriov { struct pci_dev *self; /* this PF */ struct mutex lock; /* lock for setting sriov_numvfs in sysfs */ resource_size_t barsz[PCI_SRIOV_NUM_BARS]; /* VF BAR size */ + bool drivers_autoprobe; /* auto probing of VFs by driver */ }; /* pci_dev priv_flags */ |