summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-05-28 12:44:30 +0200
committerDavid S. Miller <davem@davemloft.net>2009-05-29 10:46:27 +0200
commit28e72216d7e7af7050f171a87c1eecba93d01ea6 (patch)
treef29f63e75b5b3e9af58b043d7aa5b1b85dc15b4b
parentnet: dont update dev->trans_start (diff)
downloadlinux-28e72216d7e7af7050f171a87c1eecba93d01ea6.tar.xz
linux-28e72216d7e7af7050f171a87c1eecba93d01ea6.zip
net: unset IFF_XMIT_DST_RELEASE in ipip_tunnel_setup()
ipip_tunnel_xmit() might need skb->dst, so tell dev_hard_start_xmit() to no release it. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/ipip.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 9054139795af..bb2f1b17fbf1 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -713,6 +713,7 @@ static void ipip_tunnel_setup(struct net_device *dev)
dev->iflink = 0;
dev->addr_len = 4;
dev->features |= NETIF_F_NETNS_LOCAL;
+ dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
}
static void ipip_tunnel_init(struct net_device *dev)