[ovs-dev] [PATCH] datapath: Add support for 3.6 kernel.

[Jesse Gross]

On Sat, Oct 27, 2012 at 1:07 PM, Pravin B Shelar <pshelar at nicira.com> wrote:
> diff --git a/datapath/tunnel.c b/datapath/tunnel.c
> index 5b74877..04ff55f 100644
> --- a/datapath/tunnel.c
> +++ b/datapath/tunnel.c
> @@ -1007,10 +1011,9 @@ int ovs_tnl_send(struct vport *vport, struct sk_buff *skb)
>                 iph = ip_hdr(skb);
>                 iph->version    = 4;
>                 iph->ihl        = sizeof(struct iphdr) >> 2;
> -               iph->frag_off   = htons(IP_DF);

I think this change belongs as part of the previous patch.

> diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
> index e466323..83c4b03 100644
> --- a/datapath/vport-capwap.c
> +++ b/datapath/vport-capwap.c
> @@ -791,8 +791,11 @@ static struct sk_buff *defrag(struct sk_buff *skb, bool frag_last)
>         struct frag_queue *fq;
>
>         if (atomic_read(&ns_frag_state->mem) > ns_frag_state->high_thresh)
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
> +               inet_frag_evictor(ns_frag_state, &frag_state, true);
> +#else
>                 inet_frag_evictor(ns_frag_state, &frag_state);
> -
> +#endif

It looks to me like this change is coming in 3.7, not 3.6.