On Tue, Apr 22, 2014 at 2:08 PM, Pritesh Kothari
<[email protected]> wrote:
> diff --git a/acinclude.m4 b/acinclude.m4
> index 4269620..06983cb 100644
> --- a/acinclude.m4
> +++ b/acinclude.m4
> @@ -244,6 +244,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
> OVS_GREP_IFELSE([$KSRC/include/linux/err.h], [ERR_CAST])
>
> OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [eth_hw_addr_random])
> + OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [ether_addr_copy])
> +
> + OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32])
These should currently be in alphabetical order by file name so it
would be nice to maintain that.
> diff --git a/datapath/linux/compat/include/linux/etherdevice.h
> b/datapath/linux/compat/include/linux/etherdevice.h
> index 556729d..c6e8e92 100644
> --- a/datapath/linux/compat/include/linux/etherdevice.h
> +++ b/datapath/linux/compat/include/linux/etherdevice.h
> @@ -34,6 +34,7 @@ static inline int eth_mac_addr(struct net_device *dev, void
> *p)
> }
> #endif
>
> +#ifndef HAVE_ETHER_ADDR_COPY
> static inline void ether_addr_copy(u8 *dst, const u8 *src)
Now that we have a configure check, I think it is probably cleaner to
move this out of the version check.
> diff --git a/datapath/linux/compat/include/linux/if_tunnel.h
> b/datapath/linux/compat/include/linux/if_tunnel.h
> index 96ab702..66f9b43 100644
> --- a/datapath/linux/compat/include/linux/if_tunnel.h
> +++ b/datapath/linux/compat/include/linux/if_tunnel.h
> @@ -4,11 +4,11 @@
> #include <linux/version.h>
> #include_next <linux/if_tunnel.h>
>
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)
>
> #include <linux/u64_stats_sync.h>
>
> -struct pcpu_tstats {
> +struct pcpu_sw_netstats {
I think this lives in netdevice.h now.
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
