[ovs-dev] [PATCH v4] Tunnel: Cleanup old tunnel infrastructure.

Jesse Gross jesse at nicira.com
Wed Feb 27 02:29:22 UTC 2013


On Tue, Feb 26, 2013 at 2:14 PM, Pravin B Shelar <pshelar at nicira.com> wrote:
> diff --git a/datapath/tunnel.c b/datapath/tunnel.c
> index a05cf54..29752df 100644
> --- a/datapath/tunnel.c
> +++ b/datapath/tunnel.c
> @@ -543,15 +247,8 @@ int ovs_tnl_send(struct vport *vport, struct sk_buff *skb)
>         u8 ttl;
>         u8 tos;
>
> -       /* Validate the protocol headers before we try to use them. */
> -       if (skb->protocol == htons(ETH_P_8021Q) &&
> -           !vlan_tx_tag_present(skb)) {
> -               if (unlikely(!pskb_may_pull(skb, VLAN_ETH_HLEN)))
> -                       goto error_free;
> -
> -               skb->protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto;
> -               skb_set_network_header(skb, VLAN_ETH_HLEN);
> -       }
> +       if (unlikely(!OVS_CB(skb)->tun_key))
> +               goto error_free;
>
>         if (skb->protocol == htons(ETH_P_IP)) {
>                 if (unlikely(!pskb_may_pull(skb, skb_network_offset(skb)

I think we can remove the checks related to IP as well.



More information about the dev mailing list