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 <[email protected]> --- backport/backport-include/linux/net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backport/backport-include/linux/net.h b/backport/backport-include/linux/net.h index 385f807..0e436d4 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 */ -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
