projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic...
[linux-2.6-microblaze.git]
/
net
/
ipv4
/
ip_tunnel_core.c
diff --git
a/net/ipv4/ip_tunnel_core.c
b/net/ipv4/ip_tunnel_core.c
index
8d69626
..
6f847dd
100644
(file)
--- a/
net/ipv4/ip_tunnel_core.c
+++ b/
net/ipv4/ip_tunnel_core.c
@@
-108,7
+108,6
@@
int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto)
nf_reset(skb);
secpath_reset(skb);
skb_clear_hash_if_not_l4(skb);
- skb_dst_drop(skb);
skb->vlan_tci = 0;
skb_set_queue_mapping(skb, 0);
skb->pkt_type = PACKET_HOST;