summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-09-07 12:56:05 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-25 16:20:25 +0200
commit7793930ad12f67c15bab95fa3cea34345472722f (patch)
tree473259b8f63713fced5b92f0306df03ac38e96da /patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch
parent36f33cbcb7b2652850f76a7413adf17f12fdf5e8 (diff)
backports: refresh on v3.14.22v3.14.22-1linux-3.14.y
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.62 [ OK ] 4 3.3.8 [ OK ] 5 3.4.104 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.58 [ OK ] 12 3.11.10 [ OK ] 13 3.12.31 [ OK ] 14 3.13.11 [ OK ] 15 3.14.22 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch')
-rw-r--r--patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch b/patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch
index e8182518..d6d3f662 100644
--- a/patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch
+++ b/patches/collateral-evolutions/network/84-ethernet/0002-igb_pci_sriov_configure.patch
@@ -22,7 +22,7 @@ index f2a5abf..dd878b6 100644
.err_handler = &igb_err_handler
};
-@@ -7519,6 +7523,7 @@ static int igb_sriov_reinit(struct pci_d
+@@ -7542,6 +7546,7 @@ static int igb_sriov_reinit(struct pci_d
return 0;
}
@@ -30,7 +30,7 @@ index f2a5abf..dd878b6 100644
static int igb_pci_disable_sriov(struct pci_dev *dev)
{
int err = igb_disable_sriov(dev);
-@@ -7528,6 +7533,7 @@ static int igb_pci_disable_sriov(struct
+@@ -7551,6 +7556,7 @@ static int igb_pci_disable_sriov(struct
return err;
}
@@ -38,7 +38,7 @@ index f2a5abf..dd878b6 100644
static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs)
{
-@@ -7545,6 +7551,8 @@ out:
+@@ -7568,6 +7574,8 @@ out:
}
#endif
@@ -47,7 +47,7 @@ index f2a5abf..dd878b6 100644
static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
{
#ifdef CONFIG_PCI_IOV
-@@ -7555,6 +7563,7 @@ static int igb_pci_sriov_configure(struc
+@@ -7578,6 +7586,7 @@ static int igb_pci_sriov_configure(struc
#endif
return 0;
}