3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx> [ No relevant upstream commit. ] This reverts commit 22c3ec552c29cf4bd4a75566088950fe57d860c4. This patch is not the right fix, it introduces a memory leak when a netns is destroyed (the FB device is never deleted). Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx> Reported-by: Steven Rostedt <srostedt@xxxxxxxxxx> Tested-by: Steven Rostedt <srostedt@xxxxxxxxxx> (and our entire MRG team) Tested-by: "Luis Claudio R. Goncalves" <lgoncalv@xxxxxxxxxx> Tested-by: John Kacur <jkacur@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/ipv6/ip6_tunnel.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1711,6 +1711,8 @@ static void __net_exit ip6_tnl_destroy_t } } + t = rtnl_dereference(ip6n->tnls_wc[0]); + unregister_netdevice_queue(t->dev, &list); unregister_netdevice_many(&list); } -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html