From: Joe Stringer Date: Thu, 3 Dec 2015 07:53:42 +0000 (-0800) Subject: compat: Backport dev_recursion_level(). X-Git-Tag: v2.5.0~196 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=3f506f07614ed8a5ee0dcb2403b9c049bb3485e1 compat: Backport dev_recursion_level(). Signed-off-by: Joe Stringer Acked-by: Pravin B Shelar --- diff --git a/acinclude.m4 b/acinclude.m4 index 090712e35..5aaaa1081 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -355,6 +355,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_disable_lro]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_get_stats]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_get_by_index_rcu]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_recursion_level]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [__skb_gso_segment]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [can_checksum_protocol]) OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [ndo_get_iflink]) diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h index 576989da5..19a7b8ef5 100644 --- a/datapath/linux/compat/include/linux/netdevice.h +++ b/datapath/linux/compat/include/linux/netdevice.h @@ -199,6 +199,10 @@ struct pcpu_sw_netstats { }) #endif +#ifndef HAVE_DEV_RECURSION_LEVEL +static inline bool dev_recursion_level(void) { return false; } +#endif + #ifndef NET_NAME_USER #define NET_NAME_USER 3 #endif