Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=16d807988ffaf9b7cbb1966955aa8f738c32e740
Commit:     16d807988ffaf9b7cbb1966955aa8f738c32e740
Parent:     c54ea3b95ac504ed81e0ec3acfaa26d0f55bdfa4
Author:     Mikael Pettersson <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 15 17:17:31 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue Jan 23 20:25:43 2007 -0800

    [NETFILTER]: fix xt_state compile failure
    
    In file included from net/netfilter/xt_state.c:13:
    include/net/netfilter/nf_conntrack_compat.h: In function 
'nf_ct_l3proto_try_module_get':
    include/net/netfilter/nf_conntrack_compat.h:70: error: 'PF_INET' undeclared 
(first use in this function)
    include/net/netfilter/nf_conntrack_compat.h:70: error: (Each undeclared 
identifier is reported only once
    include/net/netfilter/nf_conntrack_compat.h:70: error: for each function it 
appears in.)
    include/net/netfilter/nf_conntrack_compat.h:71: warning: control reaches 
end of non-void function
    make[2]: *** [net/netfilter/xt_state.o] Error 1
    make[1]: *** [net/netfilter] Error 2
    make: *** [net] Error 2
    
    A simple fix is to have nf_conntrack_compat.h #include <linux/socket.h>.
    
    Signed-off-by: Mikael Pettersson <[EMAIL PROTECTED]>
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 include/net/netfilter/nf_conntrack_compat.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/net/netfilter/nf_conntrack_compat.h 
b/include/net/netfilter/nf_conntrack_compat.h
index b9ce5c8..6f84c1f 100644
--- a/include/net/netfilter/nf_conntrack_compat.h
+++ b/include/net/netfilter/nf_conntrack_compat.h
@@ -6,6 +6,7 @@
 #if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
 
 #include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/socket.h>
 
 #ifdef CONFIG_IP_NF_CONNTRACK_MARK
 static inline u_int32_t *nf_ct_get_mark(const struct sk_buff *skb,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to