diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-05-31 15:52:42 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-18 21:43:45 +0200 |
| commit | 6e5603fa9e5b0d3c602eb1672473e81a1692f61e (patch) | |
| tree | 463352ccf3c5f9ac0444dea67e88774da1a4e6b4 | |
| parent | eaa7ac4d5c98068a1fc0152284b7faed544bfa2e (diff) | |
backports: only add net_get_random_once() when not available
Upstream commit: d787b3dd3b4fcb5f40eb6532163dc3abdca4fd45
net_get_random_once() was added unconditionally also when the kernel we
are compiling against already provided this function, this patch checks
that first.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/linux/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backport/backport-include/linux/net.h b/backport/backport-include/linux/net.h index 385f8079..0e436d41 100644 --- a/backport/backport-include/linux/net.h +++ b/backport/backport-include/linux/net.h @@ -64,7 +64,7 @@ do { \ * may affect tracing. My recommendation is that if you have a need for * static keys you just require at least 3.5 to remain sane. */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) && !defined(net_get_random_once) #define __BACKPORT_NET_GET_RANDOM_ONCE 1 #endif #endif /* ___NET_RANDOM_STATIC_KEY_INIT */ |