---

yaml --- r: 90793 b: refs/heads/master c: f3005d7 h: refs/heads/master i: 90791: 4722686 v: v3
git-mirror · Apr 16, 2008 · 5704fa6 · 5704fa6
1 parent d415bc1
commit 5704fa6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3661a910836a509be65afc3c1e512d900e1280f9
+refs/heads/master: f3005d7f4abe03ad41af33b1548602cd086d86a2
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -758,7 +758,8 @@ static inline
 void dev_net_set(struct net_device *dev, struct net *net)
 {
 #ifdef CONFIG_NET_NS
-	dev->nd_net = net;
+	release_net(dev->nd_net);
+	dev->nd_net = hold_net(net);
 #endif
 }
 

diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -4042,6 +4042,8 @@ EXPORT_SYMBOL(alloc_netdev_mq);
  */
 void free_netdev(struct net_device *dev)
 {
+	release_net(dev_net(dev));
+
 	/*  Compatibility with error handling in drivers */
 	if (dev->reg_state == NETREG_UNINITIALIZED) {
 		kfree((char *)dev - dev->padded);