diff options
| author | Todd Fujinaka <todd.fujinaka@intel.com> | 2015-10-07 15:11:26 -0700 |
|---|---|---|
| committer | Todd Fujinaka <todd.fujinaka@intel.com> | 2015-10-07 15:11:26 -0700 |
| commit | 61786edd8cf6c20ef1eedc98028b59b5aeeb93c7 (patch) | |
| tree | ecc92335700193c94570c7943b66df4c9f8b5168 /kmod/igb | |
| parent | 6094b59c64b0fcb49493d02d56a29626e7167f58 (diff) | |
| download | Open-AVB-61786edd8cf6c20ef1eedc98028b59b5aeeb93c7.tar.gz | |
igb-avb: fix builds on 3.19 kernels et al
Fix builds on recent kernels.
Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Diffstat (limited to 'kmod/igb')
| -rw-r--r-- | kmod/igb/kcompat.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/kmod/igb/kcompat.h b/kmod/igb/kcompat.h index 2f33d471..72d3e60c 100644 --- a/kmod/igb/kcompat.h +++ b/kmod/igb/kcompat.h @@ -4108,6 +4108,19 @@ extern u16 __kc_netdev_pick_tx(struct net_device *dev, struct sk_buff *skb); #else #define HAVE_BRIDGE_FILTER #define HAVE_FDB_DEL_NLATTR + +#if ( LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) ) +#if !SLE_VERSION_CODE +#if (!UBUNTU_VERSION_CODE || \ + UBUNTU_VERSION_CODE >= UBUNTU_VERSION(3,19,0,15)) +#if (!RHEL_RELEASE_CODE || \ + (RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(7,1))) +#define NDO_BRIDGE_GETLINK_HAS_FILTER_MASK_PARAM +#endif /* RHEL_RELEASE_CODE */ +#endif /* UBUNTU_VERSION_CODE */ +#endif /* SLE_RELEASE_CODE */ +#endif + #endif /* < 3.9.0 */ /*****************************************************************************/ @@ -4535,7 +4548,6 @@ static inline struct sk_buff *__kc_napi_alloc_skb(struct napi_struct *napi, unsi #endif /* napi_alloc_skb */ #define HAVE_CONFIG_PM_RUNTIME #if RHEL_RELEASE_CODE && (RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(7,1)) -#define NDO_BRIDGE_GETLINK_HAS_FILTER_MASK_PARAM #define HAVE_RXFH_HASHFUNC #endif /* RHEL_RELEASE_CODE */ #else /* 3.19.0 */ @@ -4577,7 +4589,7 @@ static inline void __kc_timecounter_adjtime(struct timecounter *tc, s64 delta) #define HAVE_NDO_BRIDGE_GETLINK_NLFLAGS #endif /* 4,1,0 */ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,1,9)) +#if ( LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) ) #if (!(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(12,1,0))) static inline bool page_is_pfmemalloc(struct page __maybe_unused *page) { @@ -4588,13 +4600,10 @@ static inline bool page_is_pfmemalloc(struct page __maybe_unused *page) #endif } #endif /* !SLES12sp1 */ -#else -#undef HAVE_STRUCT_PAGE_PFMEMALLOC -#endif /* 4.1.9 */ -#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)) #else #define HAVE_NDO_DFLT_BRIDGE_GETLINK_VLAN_SUPPORT +#undef HAVE_STRUCT_PAGE_PFMEMALLOC #endif /* 4.2.0 */ #endif /* _KCOMPAT_H_ */ |