diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-02-07 23:04:11 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-02-09 14:52:26 +0100 |
| commit | e13e44d9a81da4bf77d9869db5b4764fc0811d9f (patch) | |
| tree | c610ae2b0f634df75fe88f65a047e5c741c9b0af /patches/0042-pci_error_handlers | |
| parent | 46939c43903da6b202c95a0fcb24acce55fd63c0 (diff) | |
backports: always use new version compare macros
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0042-pci_error_handlers')
| -rw-r--r-- | patches/0042-pci_error_handlers/atl1e.patch | 4 | ||||
| -rw-r--r-- | patches/0042-pci_error_handlers/igb_pci_error_handlers.cocci | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/patches/0042-pci_error_handlers/atl1e.patch b/patches/0042-pci_error_handlers/atl1e.patch index 2e83131f..2bfc1d5e 100644 --- a/patches/0042-pci_error_handlers/atl1e.patch +++ b/patches/0042-pci_error_handlers/atl1e.patch @@ -4,11 +4,11 @@ netif_device_attach(netdev); } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_IS_GEQ(3,7,0) static const struct pci_error_handlers atl1e_err_handler = { +#else +static struct pci_error_handlers atl1e_err_handler = { -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_IS_GEQ(3,7,0) */ .error_detected = atl1e_io_error_detected, .slot_reset = atl1e_io_slot_reset, .resume = atl1e_io_resume, diff --git a/patches/0042-pci_error_handlers/igb_pci_error_handlers.cocci b/patches/0042-pci_error_handlers/igb_pci_error_handlers.cocci index 19147e95..4c8ba748 100644 --- a/patches/0042-pci_error_handlers/igb_pci_error_handlers.cocci +++ b/patches/0042-pci_error_handlers/igb_pci_error_handlers.cocci @@ -3,7 +3,7 @@ identifier s; @@ static -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_IS_GEQ(3,7,0) const -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_IS_GEQ(3,7,0) */ struct pci_error_handlers s = { ... }; |