From d169ae0c8554930cf53fe48bc728f0a95d974f79 Mon Sep 17 00:00:00 2001
From: Florian Westphal <fwestphal@astaro.com>
Date: Mon, 8 Feb 2010 15:39:16 +0100
Subject: [PATCH] --- yaml --- r: 184154 b: refs/heads/master c:
 76780373190d7e8ddfb6fed06aef068e2445c743 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/net/ipv4/netfilter/nf_defrag_ipv4.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 407e26d62139..403592535dfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84f3bb9ae9db90f7fb15d98b55279a58ab1b2363
+refs/heads/master: 76780373190d7e8ddfb6fed06aef068e2445c743
diff --git a/trunk/net/ipv4/netfilter/nf_defrag_ipv4.c b/trunk/net/ipv4/netfilter/nf_defrag_ipv4.c
index 77627fa80561..f6f46686cbc0 100644
--- a/trunk/net/ipv4/netfilter/nf_defrag_ipv4.c
+++ b/trunk/net/ipv4/netfilter/nf_defrag_ipv4.c
@@ -17,6 +17,7 @@
 #include <linux/netfilter_bridge.h>
 #include <linux/netfilter_ipv4.h>
 #include <net/netfilter/ipv4/nf_defrag_ipv4.h>
+#include <net/netfilter/nf_conntrack.h>
 
 /* Returns new sk_buff, or NULL */
 static int nf_ct_ipv4_gather_frags(struct sk_buff *skb, u_int32_t user)