diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-20 15:46:28 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-21 16:39:07 +0100 |
commit | 375bd0e8cd5dca383150a4e338b1b3fb68f84fd2 (patch) | |
tree | 16a1e8513373ed7177b5cfa91231f1e84a9deeb5 /patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch | |
parent | c1761f6eadae9b8ab5488f0ebb613f807d75b81b (diff) |
patches: refresh on next-20141201
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.65 [ OK ]
4 3.3.8 [ OK ]
5 3.4.105 [ 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.63 [ OK ]
12 3.11.10 [ OK ]
13 3.12.35 [ OK ]
14 3.13.11 [ OK ]
15 3.14.27 [ OK ]
16 3.15.10 [ OK ]
17 3.16.6 [ OK ]
18 3.17.7 [ OK ]
19 3.18.1 [ OK ]
manual changed were needed for the following patches:
backport-adjustments/crypto-ccm.patch
backport-adjustments/devcoredump.patch
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.patch | 8 |
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 6ece3a26..d7c22ba0 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 }; -@@ -7521,6 +7525,7 @@ static int igb_sriov_reinit(struct pci_d +@@ -7530,6 +7534,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); -@@ -7530,6 +7535,7 @@ static int igb_pci_disable_sriov(struct +@@ -7539,6 +7544,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) { -@@ -7547,6 +7553,7 @@ out: +@@ -7556,6 +7562,7 @@ out: } #endif @@ -44,7 +44,7 @@ static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs) { #ifdef CONFIG_PCI_IOV -@@ -7557,6 +7564,7 @@ static int igb_pci_sriov_configure(struc +@@ -7566,6 +7573,7 @@ static int igb_pci_sriov_configure(struc #endif return 0; } |