[ovs-dev] [PATCH v2] datapath: Provide compatibility for kernels up to 3.17

Pravin Shelar pshelar at nicira.com
Sun Sep 21 02:54:27 UTC 2014


On Thu, Sep 18, 2014 at 5:48 AM, Thomas Graf <tgraf at noironetworks.com> wrote:
> Port datapath to work with kernrels up to 3.17 and use 3.16.2 as
> the new kernel for CI testing.
>
> Tested with 3.14, 3.16.2, and net-next (3.17).
>
> Signed-off-by: Thomas Graf <tgraf at noironetworks.com>
> Co-authored-by: Madhu Challa <challa at noironetworks.com>
> ---
> v2:
>  - Swapped ignore_df local_df compat direction
>  - Provide alloc_netdev() compat macro to avoid #ifdef
>  - iptunnel_xmit() version for > 3.12 && < 3.15
>

Thanks. I just made one change and pushed to master.

>  .travis.yml                                     |  2 +-
>  .travis/build.sh                                |  6 ++--
>  acinclude.m4                                    | 12 ++++++--
>  datapath/linux/Modules.mk                       |  1 +
>  datapath/linux/compat/include/linux/if.h        | 12 --------
>  datapath/linux/compat/include/linux/netdevice.h | 21 ++++++++++++++
>  datapath/linux/compat/include/linux/skbuff.h    |  4 +++
>  datapath/linux/compat/include/net/ip_tunnels.h  | 14 +++++++++-
>  datapath/linux/compat/include/net/udp.h         | 37 +++++++++++++++++++++++++
>  datapath/linux/compat/include/net/vxlan.h       |  5 ++++
>  datapath/linux/compat/ip_tunnels_core.c         |  2 +-
>  datapath/linux/compat/vxlan.c                   |  3 +-
>  datapath/vport-geneve.c                         |  8 ++++--
>  datapath/vport-gre.c                            |  4 +--
>  datapath/vport-internal_dev.c                   |  4 +--
>  datapath/vport-lisp.c                           |  4 +--
>  datapath/vport-netdev.c                         |  3 +-
>  datapath/vport-vxlan.c                          | 12 ++------
>  18 files changed, 114 insertions(+), 40 deletions(-)
>  create mode 100644 datapath/linux/compat/include/net/udp.h
>

.....

>
> +#ifndef HAVE_NET_NAME_UNKNOWN
> +#undef alloc_netdev
> +#define NET_NAME_UNKNOWN 0
> +#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
> +        alloc_netdev_mqs(sizeof_priv, name_assign_type, setup, 1, 1)
> +#endif
> +
I changed name_assign_type to name.



More information about the dev mailing list