From 786a57b0f1ce67bb438ca8f875d101a9d1fe5bfb Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 12 Sep 2007 11:56:32 +0200
Subject: [PATCH] --- yaml --- r: 66381 b: refs/heads/master c:
 4a1c537113cdc688aabc3fb9bb6ed18ec821c779 h: refs/heads/master i:   66379:
 021fb1ac8b85bb652563c6037d413c2cd18dc72b v: v3

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

diff --git a/[refs] b/[refs]
index 6c04093875bf..0e50327979c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 772698f6362680b65211f7efc68121f1e4c28aa5
+refs/heads/master: 4a1c537113cdc688aabc3fb9bb6ed18ec821c779
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 8f00bdf95ef4..dc3c15b726bc 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -41,6 +41,7 @@
 #include <linux/dmaengine.h>
 #include <linux/workqueue.h>
 
+struct net;
 struct vlan_group;
 struct ethtool_ops;
 struct netpoll_info;
@@ -663,6 +664,9 @@ struct net_device
 	void                    (*poll_controller)(struct net_device *dev);
 #endif
 
+	/* Network namespace this network device is inside */
+	struct net		*nd_net;
+
 	/* bridge stuff */
 	struct net_bridge_port	*br_port;
 	/* macvlan */