Home » Mailing list archives » linux-netdev » 2009 » May » 28

[PATCH net-next-2.6] net: unset IFF_XMIT_DST_RELEASE in ipip_tunnel_setup()

Previous thread: [PATCH] Multicast socket option by Nivedita Singhvi on Thursday, May 28, 2009 - 10:00 am. (7 messages)

Next thread: HTB class parameter change by Piotrek D on Thursday, May 28, 2009 - 1:47 pm. (3 messages)
[view original message]
From: Eric Dumazet
Subject: [PATCH net-next-2.6] net: unset IFF_XMIT_DST_RELEASE in ipip_tunnel_setup()
Date: Thursday, May 28, 2009 - 1:44 pm

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>
---
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 9054139..bb2f1b1 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)
--


[ message continues ]
[view original message]
From: Eric Dumazet
Subject: [PATCH net-next-2.6] net: unset IFF_XMIT_DST_RELEASE in ipgre_tunnel_setup()
Date: Friday, May 29, 2009 - 1:35 am

ipgre_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>
---
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index e62510d..77436e2 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1238,6 +1238,7 @@ static void ipgre_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 int ipgre_tunnel_init(struct net_device *dev)
--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH net-next-2.6] net: unset IFF_XMIT_DST_RELEASE in ipgre_tunnel_setup()
Date: Friday, May 29, 2009 - 1:47 am

From: Eric Dumazet <eric.dumazet@gmail.com>

Applied.
--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH net-next-2.6] net: unset IFF_XMIT_DST_RELEASE in ipip_tunnel_setup()
Date: Friday, May 29, 2009 - 1:47 am

From: Eric Dumazet <eric.dumazet@gmail.com>

Applied.
--


[ message continues ]
Previous thread: [PATCH] Multicast socket option by Nivedita Singhvi on Thursday, May 28, 2009 - 10:00 am. (7 messages)

Next thread: HTB class parameter change by Piotrek D on Thursday, May 28, 2009 - 1:47 pm. (3 messages)