aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-03-26 00:47:14 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-26 00:47:14 -0700
commit9c2f5746b9cd536f0007709196d85a7e7d0070fa (patch)
treed368ab8a2f969090f2ed6d399ef50afe555cfa53 /include
parentMerge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff)
downloadlinux-dev-9c2f5746b9cd536f0007709196d85a7e7d0070fa.tar.xz
linux-dev-9c2f5746b9cd536f0007709196d85a7e7d0070fa.zip
[NETNS]: Compilation fix for include/linux/netdevice.h.
Commit commit c346dca10840a874240c78efe3f39acf4312a1f2 ([NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS) breaks compilation with CONFIG_NET_NS set. Fix the typo. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netdevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d146be40f46c..06ca84d71db4 100644
--- a/include/linux/netdevice.h
+++ b/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
}