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 /backport/compat/backport-3.18.c | |
| parent | 46939c43903da6b202c95a0fcb24acce55fd63c0 (diff) | |
backports: always use new version compare macros
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport/compat/backport-3.18.c')
| -rw-r--r-- | backport/compat/backport-3.18.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/backport/compat/backport-3.18.c b/backport/compat/backport-3.18.c index 5c3e751e..73db233c 100644 --- a/backport/compat/backport-3.18.c +++ b/backport/compat/backport-3.18.c @@ -167,7 +167,7 @@ struct sk_buff *skb_clone_sk(struct sk_buff *skb) } EXPORT_SYMBOL_GPL(skb_clone_sk); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) +#if LINUX_VERSION_IS_GEQ(3,3,0) /* * skb_complete_wifi_ack() needs to get backported, because the version from * 3.18 added the sock_hold() and sock_put() calles missing in older versions. @@ -198,7 +198,7 @@ void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) EXPORT_SYMBOL_GPL(skb_complete_wifi_ack); #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) +#if LINUX_VERSION_IS_GEQ(3,17,0) int __sched out_of_line_wait_on_bit_timeout( void *word, int bit, wait_bit_action_f *action, unsigned mode, unsigned long timeout) @@ -288,17 +288,17 @@ int of_property_read_u64_array(const struct device_node *np, EXPORT_SYMBOL_GPL(of_property_read_u64_array); #endif /* CONFIG_OF */ -#if !(LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,3) || \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,24) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)) || \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,33) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)) || \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,60) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)) || \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,106) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)) || \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,65) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0))) +#if !(LINUX_VERSION_IS_GEQ(3,17,3) || \ + (LINUX_VERSION_IS_GEQ(3,14,24) && \ + LINUX_VERSION_IS_LESS(3,15,0)) || \ + (LINUX_VERSION_IS_GEQ(3,12,33) && \ + LINUX_VERSION_IS_LESS(3,13,0)) || \ + (LINUX_VERSION_IS_GEQ(3,10,60) && \ + LINUX_VERSION_IS_LESS(3,11,0)) || \ + (LINUX_VERSION_IS_GEQ(3,4,106) && \ + LINUX_VERSION_IS_LESS(3,5,0)) || \ + (LINUX_VERSION_IS_GEQ(3,2,65) && \ + LINUX_VERSION_IS_LESS(3,3,0))) /** * memzero_explicit - Fill a region of memory (e.g. sensitive * keying data) with 0s. |