---

yaml --- r: 6437 b: refs/heads/master c: 4524b25 h: refs/heads/master i: 6435: 54b75b3 v: v3
git-mirror · Aug 29, 2005 · e2f4b7c · e2f4b7c
1 parent 089b196
commit e2f4b7c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae6706f0678b89de07ad3b456893cc883584f711
+refs/heads/master: 4524b259541e1eea07020af825d8e7b0e4faaec5
diff --git a/trunk/net/dccp/Makefile b/trunk/net/dccp/Makefile
@@ -1,7 +1,7 @@
 obj-$(CONFIG_IP_DCCP) += dccp.o
 
 dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
-	  timer.o packet_history.o
+	  timer.o
 
 obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
 

diff --git a/trunk/net/dccp/ccids/Makefile b/trunk/net/dccp/ccids/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o
 
-dccp_ccid3-y := ccid3.o lib/loss_interval.o
+dccp_ccid3-y := ccid3.o lib/loss_interval.o lib/packet_history.o
diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c
@@ -37,7 +37,7 @@
 #include <linux/config.h>
 #include "../ccid.h"
 #include "../dccp.h"
-#include "../packet_history.h"
+#include "lib/packet_history.h"
 #include "lib/loss_interval.h"
 #include "ccid3.h"
 

diff --git a/trunk/net/dccp/packet_history.c → trunk/net/dccp/ccids/lib/packet_history.c b/trunk/net/dccp/packet_history.c → trunk/net/dccp/ccids/lib/packet_history.c
diff --git a/trunk/net/dccp/packet_history.h → trunk/net/dccp/ccids/lib/packet_history.h b/trunk/net/dccp/packet_history.h → trunk/net/dccp/ccids/lib/packet_history.h
@@ -42,7 +42,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 
-#include "dccp.h"
+#include "../../dccp.h"
 
 struct dccp_tx_hist_entry {
 	struct list_head dccphtx_node;