浏览代码

[DCCP]: Just move packet_history.[ch] to net/dccp/ccids/lib/

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Arnaldo Carvalho de Melo 19 年之前
父节点
当前提交
4524b25954
共有 5 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      net/dccp/Makefile
  2. 1 1
      net/dccp/ccids/Makefile
  3. 1 1
      net/dccp/ccids/ccid3.c
  4. 0 0
      net/dccp/ccids/lib/packet_history.c
  5. 1 1
      net/dccp/ccids/lib/packet_history.h

+ 1 - 1
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
 

+ 1 - 1
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

+ 1 - 1
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"
 

+ 0 - 0
net/dccp/packet_history.c → net/dccp/ccids/lib/packet_history.c


+ 1 - 1
net/dccp/packet_history.h → 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;