From eb86d57d07fbe82b3151d799ec5459fa4d840d45 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Tue, 4 Dec 2007 01:15:45 -0800
Subject: [PATCH] --- yaml --- r: 78278 b: refs/heads/master c:
 0eeb8ffcfeaa0d909ce39147f7b8fdd6cef1aacd h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/net/pkt_cls.h | 3 ++-
 trunk/include/net/sock.h    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 72e8c4b0f4a9..44cbea7c9953 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ac552fdc6e96bf2f39c18d6e66b8c8080bbb06e
+refs/heads/master: 0eeb8ffcfeaa0d909ce39147f7b8fdd6cef1aacd
diff --git a/trunk/include/net/pkt_cls.h b/trunk/include/net/pkt_cls.h
index f285de69c615..2eaf20480024 100644
--- a/trunk/include/net/pkt_cls.h
+++ b/trunk/include/net/pkt_cls.h
@@ -2,7 +2,6 @@
 #define __NET_PKT_CLS_H
 
 #include <linux/pkt_cls.h>
-#include <net/net_namespace.h>
 #include <net/sch_generic.h>
 #include <net/act_api.h>
 
@@ -336,6 +335,8 @@ static inline int tcf_valid_offset(const struct sk_buff *skb,
 }
 
 #ifdef CONFIG_NET_CLS_IND
+#include <net/net_namespace.h>
+
 static inline int
 tcf_change_indev(struct tcf_proto *tp, char *indev, struct rtattr *indev_tlv)
 {
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index bcbf8891dde4..800e73a62d8f 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -57,7 +57,6 @@
 #include <asm/atomic.h>
 #include <net/dst.h>
 #include <net/checksum.h>
-#include <net/net_namespace.h>
 
 /*
  * This structure really needs to be cleaned up.
@@ -95,6 +94,7 @@ typedef struct {
 
 struct sock;
 struct proto;
+struct net;
 
 /**
  *	struct sock_common - minimal network layer representation of sockets