Re: [PATCH 2.6.25] net: removes unnecessary dependencies for net_namespace.h

["Denis V. Lunev" <den@sw.ru>]

[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]

you right, how about this?

Eric W. Biederman wrote:
> "Denis V. Lunev" <den@openvz.org> writes:
> 
>> This patch removes some unneeded includes for net_namespace.h to speed up
>> compilation.
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>>
>> diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
>> index f285de6..28b7f25 100644
>> --- a/include/net/pkt_cls.h
>> +++ b/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>
> 
> What of tcf_match_indev?  I guess linux/netdevice.h brings
> it in for us but still.
> 
>> diff --git a/include/net/sock.h b/include/net/sock.h
>> index 43e3cd9..a04e361 100644
>> --- a/include/net/sock.h
>> +++ b/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
> 
> This hunk definitely looks sane.
> 
> Eric
> 
> 


[-- Attachment #2: 1.diff --]
[-- Type: text/plain, Size: 1027 bytes --]

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index f285de6..2eaf204 100644
--- a/include/net/pkt_cls.h
+++ b/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/include/net/sock.h b/include/net/sock.h
index 43e3cd9..a04e361 100644
--- a/include/net/sock.h
+++ b/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