diff options
author | Stefan Assmann <sassmann@kpanic.de> | 2014-05-16 13:21:24 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-02 00:16:15 +0200 |
commit | 525b264c8fb1c626be04880ea134a1112288f09e (patch) | |
tree | 49b26288936ad08d5231536ee66c0a078a34c5e3 /patches | |
parent | 2b21554d3828d5dbfa8bc80f03d8e98aeab953b5 (diff) |
backports: handle pci_error_handlers change to const
In kernel 3.7 struct pci_driver changed pci_error_handlers to const.
Address this by putting ifdef around the code.
commit 494530284f16298050ab99f54b7b12dd7d1418a1
Author: Stephen Hemminger <shemminger@vyatta.com>
Date: Fri Sep 7 09:33:14 2012 -0700
PCI: Make pci_error_handlers const
git describe --contains 494530284f16298050ab99f54b7b12dd7d1418a1
v3.7-rc1~177^2~9^2~3
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/collateral-evolutions/network/0042-pci_error_handlers/INFO | 12 | ||||
-rw-r--r-- | patches/collateral-evolutions/network/0042-pci_error_handlers/igb_pci_error_handlers.patch | 16 |
2 files changed, 28 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/0042-pci_error_handlers/INFO b/patches/collateral-evolutions/network/0042-pci_error_handlers/INFO new file mode 100644 index 00000000..ffb183c1 --- /dev/null +++ b/patches/collateral-evolutions/network/0042-pci_error_handlers/INFO @@ -0,0 +1,12 @@ +In kernel 3.7 struct pci_driver changed pci_error_handlers to const. +Address this by putting ifdef around the code. + + +commit 494530284f16298050ab99f54b7b12dd7d1418a1 +Author: Stephen Hemminger <shemminger@vyatta.com> +Date: Fri Sep 7 09:33:14 2012 -0700 + + PCI: Make pci_error_handlers const + +git describe --contains 494530284f16298050ab99f54b7b12dd7d1418a1 +v3.7-rc1~177^2~9^2~3 diff --git a/patches/collateral-evolutions/network/0042-pci_error_handlers/igb_pci_error_handlers.patch b/patches/collateral-evolutions/network/0042-pci_error_handlers/igb_pci_error_handlers.patch new file mode 100644 index 00000000..cedff126 --- /dev/null +++ b/patches/collateral-evolutions/network/0042-pci_error_handlers/igb_pci_error_handlers.patch @@ -0,0 +1,16 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c +index 132cef8..0e616a7 100644 +--- a/drivers/net/ethernet/intel/igb/igb_main.c ++++ b/drivers/net/ethernet/intel/igb/igb_main.c +@@ -234,7 +234,11 @@ static pci_ers_result_t igb_io_error_detected(struct pci_dev *, + static pci_ers_result_t igb_io_slot_reset(struct pci_dev *); + static void igb_io_resume(struct pci_dev *); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) + static const struct pci_error_handlers igb_err_handler = { ++#else ++static struct pci_error_handlers igb_err_handler = { ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */ + .error_detected = igb_io_error_detected, + .slot_reset = igb_io_slot_reset, + .resume = igb_io_resume, |