Message ID | 1449129236-5038-20-git-send-email-joe@ovn.org |
---|---|
State | Accepted |
Headers | show |
diff --git a/datapath/vport.c b/datapath/vport.c index 0951cbbdb4e6..899119f9f992 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -494,6 +494,15 @@ int ovs_vport_receive(struct vport *vport, struct sk_buff *skb, OVS_CB(skb)->input_vport = vport; OVS_CB(skb)->mru = 0; + if (unlikely(dev_net(skb->dev) != ovs_dp_get_net(vport->dp))) { + u32 mark; + + mark = skb->mark; + skb_scrub_packet(skb, true); + skb->mark = mark; + tun_info = NULL; + } + ovs_skb_init_inner_protocol(skb); skb_clear_ovs_gso_cb(skb); /* Extract flow from 'skb' into 'key'. */