summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-07-25 20:56:35 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-07-28 00:09:28 +0200
commitf82cf56b854bbfb54957ccc7f3e258c31d1a8afe (patch)
tree4e2c578157a7025d9abaf818c8b6b338c3cef60e /patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
parente8d572ffeb32e5507d7eca983d531ac623b4c9ef (diff)
backports: refresh on next-20140725backports-20140725
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.60 [ OK ] 4 3.3.8 [ OK ] 5 3.4.93 [ 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.43 [ OK ] 12 3.11.10 [ OK ] 13 3.12.22 [ OK ] 14 3.13.11 [ OK ] 15 3.14.7 [ OK ] 16 3.15.0 [ OK ] 17 3.16-rc1 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch')
-rw-r--r--patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
index a75e3aad..7f0c1eab 100644
--- a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
+++ b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
@@ -20,7 +20,7 @@
.err_handler = &igb_err_handler
};
-@@ -7598,6 +7602,7 @@ static int igb_sriov_reinit(struct pci_d
+@@ -7614,6 +7618,7 @@ static int igb_sriov_reinit(struct pci_d
return 0;
}
@@ -28,7 +28,7 @@
static int igb_pci_disable_sriov(struct pci_dev *dev)
{
int err = igb_disable_sriov(dev);
-@@ -7607,6 +7612,7 @@ static int igb_pci_disable_sriov(struct
+@@ -7623,6 +7628,7 @@ static int igb_pci_disable_sriov(struct
return err;
}
@@ -36,7 +36,7 @@
static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs)
{
-@@ -7624,6 +7630,7 @@ out:
+@@ -7640,6 +7646,7 @@ out:
}
#endif
@@ -44,7 +44,7 @@
static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
{
#ifdef CONFIG_PCI_IOV
-@@ -7634,6 +7641,7 @@ static int igb_pci_sriov_configure(struc
+@@ -7650,6 +7657,7 @@ static int igb_pci_sriov_configure(struc
#endif
return 0;
}