From 57a66cc7856779d300b80b009bdefee7f242aa20 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Wed, 26 Mar 2008 00:47:14 -0700
Subject: [PATCH] --- yaml --- r: 90399 b: refs/heads/master c:
 9c2f5746b9cd536f0007709196d85a7e7d0070fa h: refs/heads/master i:   90397:
 02ccec4f5e193a68efcfd5e06c68780c3d65bf8c   90395:
 1d2ac2ddc8406e194749a9a6358d5f6adb307137   90391:
 a72229050ffdc3f87a0ed45201a4150e976fc202   90383:
 5ff07975ca6778d6fe713406babf5f7cfff8d384   90367:
 4fb6a4e9894e0f099fecc066d02f6bd32e574b18 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 32ae1056a2ec..8bd393cb4e92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14eabf70c82cade5dbc71d2e913d533193a91785
+refs/heads/master: 9c2f5746b9cd536f0007709196d85a7e7d0070fa
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index d146be40f46c..06ca84d71db4 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -756,7 +756,7 @@ static inline
 void dev_net_set(struct net_device *dev, const struct net *net)
 {
 #ifdef CONFIG_NET_NS
-	dev->nd_dev = net;
+	dev->nd_net = net;
 #endif
 }