diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-09 13:43:05 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-09 16:42:28 +0200 |
commit | 9eb338787fa1183183a371c63f98488c4ddc1104 (patch) | |
tree | d20c83a8c658bb10502ed1bf8e05b98bd4413bbc /patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch | |
parent | 00d3fc79b53d1f9ddf88edbb81a71391a9bfffd7 (diff) |
backports: refresh patches on next-20140808
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.102 [ 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.52 [ OK ]
12 3.11.10 [ OK ]
13 3.12.26 [ OK ]
14 3.13.11 [ OK ]
15 3.14.16 [ OK ]
16 3.15.7 [ OK ]
17 3.16.0 [ OK ]
Manual changes were done to:
patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch
This patch was removed:
patches/collateral-evolutions/network/0009-inet_frag_evictor.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 7f0c1eab..49d894bd 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 }; -@@ -7614,6 +7618,7 @@ static int igb_sriov_reinit(struct pci_d +@@ -7639,6 +7643,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); -@@ -7623,6 +7628,7 @@ static int igb_pci_disable_sriov(struct +@@ -7648,6 +7653,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) { -@@ -7640,6 +7646,7 @@ out: +@@ -7665,6 +7671,7 @@ out: } #endif @@ -44,7 +44,7 @@ static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs) { #ifdef CONFIG_PCI_IOV -@@ -7650,6 +7657,7 @@ static int igb_pci_sriov_configure(struc +@@ -7675,6 +7682,7 @@ static int igb_pci_sriov_configure(struc #endif return 0; } |