---

yaml --- r: 361050 b: refs/heads/master c: 88c4c06 h: refs/heads/master v: v3
git-mirror · Mar 6, 2013 · 59ab954 · 59ab954
1 parent f681bfe
commit 59ab954
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76e4cb0d3a583900f844f1704b19b7e8c5df8837
+refs/heads/master: 88c4c066c6b4db26dc4909ee94e6bf377e8e8e81
diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c
@@ -961,6 +961,8 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 	iph->ttl	= ttl ? : ip4_dst_hoplimit(&rt->dst);
 	tunnel_ip_select_ident(skb, old_iph, &rt->dst);
 
+	nf_reset(skb);
+
 	vxlan_set_owner(dev, skb);
 
 	/* See iptunnel_xmit() */