diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-25 14:06:57 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-25 14:39:23 +0200 |
| commit | 95411f9653a8435c172d47ce3a9d84985a8ba3e1 (patch) | |
| tree | bbdd2b403a83b3570e143c4789a04a9497f054e6 | |
| parent | 9355116d12ec08de12eb5394191b5d87788cf6b6 (diff) | |
header: do not use genl backport on RHEL 7.0
The genl changes were backported to RHEL 7.0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/net/genetlink.h | 2 | ||||
| -rw-r--r-- | backport/compat/backport-3.13.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/backport/backport-include/net/genetlink.h b/backport/backport-include/net/genetlink.h index 0535b0f1..5761268f 100644 --- a/backport/backport-include/net/genetlink.h +++ b/backport/backport-include/net/genetlink.h @@ -18,7 +18,7 @@ #define genl_dump_check_consistent(cb, user_hdr, family) #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) && RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) static inline int __real_genl_register_family(struct genl_family *family) { return genl_register_family(family); diff --git a/backport/compat/backport-3.13.c b/backport/compat/backport-3.13.c index e281ac87..6ce72b2c 100644 --- a/backport/compat/backport-3.13.c +++ b/backport/compat/backport-3.13.c @@ -93,6 +93,7 @@ EXPORT_SYMBOL_GPL(devm_regulator_unregister); #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) */ /************* generic netlink backport *****************/ +#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) #undef genl_register_family #undef genl_unregister_family @@ -154,6 +155,8 @@ int backport_genl_unregister_family(struct genl_family *family) } EXPORT_SYMBOL_GPL(backport_genl_unregister_family); +#endif /* RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) */ + #ifdef __BACKPORT_NET_GET_RANDOM_ONCE struct __net_random_once_work { struct work_struct work; |