From e4993be8553ab39cc2810809e507d8aab1fc827c Mon Sep 17 00:00:00 2001
From: Jesse Gross <jesse@nicira.com>
Date: Fri, 25 May 2012 11:29:30 -0700
Subject: [PATCH] --- yaml --- r: 315747 b: refs/heads/master c:
 7fe99e2d434eafeac0c57b279a77e5de39212636 h: refs/heads/master i:   315745:
 f51aab7747b2600497d433e3183d8d85a507d486   315743:
 250ff613d461bcaec48691d5d17cf420f332af56 v: v3

---
 [refs]                                     | 2 +-
 trunk/net/openvswitch/vport-internal_dev.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cc318523536b..7c2cd11e201b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caf2ee14bbc2c6bd73cf0decf576007e0239a482
+refs/heads/master: 7fe99e2d434eafeac0c57b279a77e5de39212636
diff --git a/trunk/net/openvswitch/vport-internal_dev.c b/trunk/net/openvswitch/vport-internal_dev.c
index de509d347112..4061b9ee07f7 100644
--- a/trunk/net/openvswitch/vport-internal_dev.c
+++ b/trunk/net/openvswitch/vport-internal_dev.c
@@ -24,6 +24,9 @@
 #include <linux/ethtool.h>
 #include <linux/skbuff.h>
 
+#include <net/dst.h>
+#include <net/xfrm.h>
+
 #include "datapath.h"
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
@@ -209,6 +212,11 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 	int len;
 
 	len = skb->len;
+
+	skb_dst_drop(skb);
+	nf_reset(skb);
+	secpath_reset(skb);
+
 	skb->dev = netdev;
 	skb->pkt_type = PACKET_HOST;
 	skb->protocol = eth_type_trans(skb, netdev);