diff options
author | Stefan Assmann <sassmann@kpanic.de> | 2014-01-29 10:19:02 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-31 22:36:53 +0100 |
commit | d114f15cbaf8c3c70c88dec96434f7a07077afb3 (patch) | |
tree | 5a1e716b33f8b0ce9c83e0cc377015a4c5c0fb90 /backport/backport-include/linux/pci.h | |
parent | a0375b0a754d5bbd9fd34634a0c10d743e7a15b8 (diff) |
backports: igb fixes for linux-3.7
- add pci_sriov_set_totalvfs()
- add patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch
Several ifdefs in igb_main.c to avoid compiler warnings.
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'backport/backport-include/linux/pci.h')
-rw-r--r-- | backport/backport-include/linux/pci.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/backport/backport-include/linux/pci.h b/backport/backport-include/linux/pci.h index f36384e0..5201f1b0 100644 --- a/backport/backport-include/linux/pci.h +++ b/backport/backport-include/linux/pci.h @@ -178,6 +178,11 @@ bool pci_pme_capable(struct pci_dev *dev, pci_power_t state); .subvendor = (subvend), .subdevice = (subdev) #endif /* PCI_DEVICE_SUB */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) +#define pci_sriov_set_totalvfs LINUX_BACKPORT(pci_sriov_set_totalvfs) +int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) /* Taken from drivers/pci/pci.h */ struct pci_sriov { @@ -211,5 +216,4 @@ static inline int pci_vfs_assigned(struct pci_dev *dev) #endif #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */ - #endif /* _BACKPORT_LINUX_PCI_H */ |