diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-11 01:45:20 +0000 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-04-17 16:23:08 -0700 |
commit | be4a0f9ad7e17670d7a30c9e94d5dd918425f90a (patch) | |
tree | e357fbef6a8bd452136a59c59a0b654d666d38a8 /patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch | |
parent | 0429914b5f1cb02830dbc4200d615abd9b3f2f7c (diff) |
backports: nuke support for kernels < 3.0
mcgrof@drvbp1 ~/backports (git::master)$ time ./gentree.py --clean
/home/mcgrof/linux-next /home/mcgrof/build/next-20140409
Copy original source files ...
Apply patches ...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Done!
real 1m30.186s
user 9m25.180s
sys 0m24.428s
mcgrof@drvbp1 ~/build/next-20140409 $ time ckmake --allyesconfig
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.54 [ OK ]
4 3.3.8 [ OK ]
5 3.4.79 [ 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.29 [ OK ]
12 3.11.10 [ OK ]
13 3.12.10 [ OK ]
14 3.13.2 [ OK ]
15 3.14-rc1 [ OK ]
real 26m54.859s
user 744m15.764s
sys 83m47.440s
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch')
-rw-r--r-- | patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch new file mode 100644 index 00000000..fc3c09cd --- /dev/null +++ b/patches/the-way-not-to-do-backports/0001-ethernet-igb/0002-igb_pci_sriov_configure.patch @@ -0,0 +1,57 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index f2a5abf..dd878b6 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -206,7 +206,9 @@ static const struct dev_pm_ops igb_pm_op + }; + #endif + static void igb_shutdown(struct pci_dev *); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) + static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs); ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) */ + #ifdef CONFIG_IGB_DCA + static int igb_notify_dca(struct notifier_block *, unsigned long, void *); + static struct notifier_block dca_notifier = { +@@ -248,7 +250,9 @@ static struct pci_driver igb_driver = { + .driver.pm = &igb_pm_ops, + #endif + .shutdown = igb_shutdown, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) + .sriov_configure = igb_pci_sriov_configure, ++#endif + .err_handler = &igb_err_handler + }; + +@@ -7560,6 +7564,7 @@ static int igb_sriov_reinit(struct pci_d + return 0; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) + static int igb_pci_disable_sriov(struct pci_dev *dev) + { + int err = igb_disable_sriov(dev); +@@ -7569,6 +7574,7 @@ static int igb_pci_disable_sriov(struct + + return err; + } ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) */ + + static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs) + { +@@ -7586,6 +7592,8 @@ out: + } + + #endif ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) + static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs) + { + #ifdef CONFIG_PCI_IOV +@@ -7596,6 +7604,7 @@ static int igb_pci_sriov_configure(struc + #endif + return 0; + } ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) */ + + #ifdef CONFIG_NET_POLL_CONTROLLER + /* Polling 'interrupt' - used by things like netconsole to send skbs |