From 2f39570efd83b571f839375bf440a289c59d40da Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 12 Sep 2007 11:58:02 +0200
Subject: [PATCH] --- yaml --- r: 66382 b: refs/heads/master c:
 07feaebfcc10cd35e745c7073667935246494bee h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/include/net/inet_timewait_sock.h | 1 +
 trunk/include/net/sock.h               | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0e50327979c8..3f89e552b1c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a1c537113cdc688aabc3fb9bb6ed18ec821c779
+refs/heads/master: 07feaebfcc10cd35e745c7073667935246494bee
diff --git a/trunk/include/net/inet_timewait_sock.h b/trunk/include/net/inet_timewait_sock.h
index 47d52b2414db..abaff0597270 100644
--- a/trunk/include/net/inet_timewait_sock.h
+++ b/trunk/include/net/inet_timewait_sock.h
@@ -115,6 +115,7 @@ struct inet_timewait_sock {
 #define tw_refcnt		__tw_common.skc_refcnt
 #define tw_hash			__tw_common.skc_hash
 #define tw_prot			__tw_common.skc_prot
+#define tw_net			__tw_common.skc_net
 	volatile unsigned char	tw_substate;
 	/* 3 bits hole, try to pack */
 	unsigned char		tw_rcv_wscale;
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 5ed9fa42b6e8..9ef8b5fb7936 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -105,6 +105,7 @@ struct proto;
  *	@skc_refcnt: reference count
  *	@skc_hash: hash value used with various protocol lookup tables
  *	@skc_prot: protocol handlers inside a network family
+ *	@skc_net: reference to the network namespace of this socket
  *
  *	This is the minimal network layer representation of sockets, the header
  *	for struct sock and struct inet_timewait_sock.
@@ -119,6 +120,7 @@ struct sock_common {
 	atomic_t		skc_refcnt;
 	unsigned int		skc_hash;
 	struct proto		*skc_prot;
+	struct net	 	*skc_net;
 };
 
 /**
@@ -195,6 +197,7 @@ struct sock {
 #define sk_refcnt		__sk_common.skc_refcnt
 #define sk_hash			__sk_common.skc_hash
 #define sk_prot			__sk_common.skc_prot
+#define sk_net			__sk_common.skc_net
 	unsigned char		sk_shutdown : 2,
 				sk_no_check : 2,
 				sk_userlocks : 4;