diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-19 15:05:11 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-23 23:30:46 +0200 |
commit | 22cdc9b32ee4fc4ce997f69ef7b4549ac95a1434 (patch) | |
tree | 9879b004c812964a53a4f4405367c742b8c07771 /backport/backport-include/linux/skbuff.h | |
parent | 37da55ab322d36f65807b58bfa3a03b26a21c3be (diff) |
backports: add some ubuntu trusty specific changes
It is now possible to detect a ubuntu kernel see:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1327619
This uses the new define and adds some code depending on the ubuntu
trusty kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'backport/backport-include/linux/skbuff.h')
-rw-r--r-- | backport/backport-include/linux/skbuff.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index a7076638..4b4ca507 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -2,6 +2,7 @@ #define __BACKPORT_SKBUFF_H #include_next <linux/skbuff.h> #include <linux/version.h> +#include <generated/utsrelease.h> #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && \ (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4)) && \ @@ -327,7 +328,9 @@ static inline void skb_frag_set_page(struct sk_buff *skb, int f, } #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) && RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) && \ + RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) && \ + !(LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30) /* * Packet hash types specify the type of hash in skb_set_hash. * |