diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/dccp/Makefile | 2 | ||||
-rw-r--r-- | net/dccp/ccids/Makefile | 2 | ||||
-rw-r--r-- | net/dccp/ccids/ccid3.c | 2 | ||||
-rw-r--r-- | net/dccp/ccids/lib/packet_history.c (renamed from net/dccp/packet_history.c) | 0 | ||||
-rw-r--r-- | net/dccp/ccids/lib/packet_history.h (renamed from net/dccp/packet_history.h) | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/Makefile b/net/dccp/Makefile index 44a867f29184..fb97bb042455 100644 --- a/net/dccp/Makefile +++ b/net/dccp/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | obj-$(CONFIG_IP_DCCP) += dccp.o | 1 | obj-$(CONFIG_IP_DCCP) += dccp.o |
2 | 2 | ||
3 | dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \ | 3 | dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \ |
4 | timer.o packet_history.o | 4 | timer.o |
5 | 5 | ||
6 | obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o | 6 | obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o |
7 | 7 | ||
diff --git a/net/dccp/ccids/Makefile b/net/dccp/ccids/Makefile index 323b68f3b607..29eb1b61fdbd 100644 --- a/net/dccp/ccids/Makefile +++ b/net/dccp/ccids/Makefile | |||
@@ -1,3 +1,3 @@ | |||
1 | obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o | 1 | obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o |
2 | 2 | ||
3 | dccp_ccid3-y := ccid3.o lib/loss_interval.o | 3 | dccp_ccid3-y := ccid3.o lib/loss_interval.o lib/packet_history.o |
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index 7468928b83c6..12548fbde86b 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <linux/config.h> | 37 | #include <linux/config.h> |
38 | #include "../ccid.h" | 38 | #include "../ccid.h" |
39 | #include "../dccp.h" | 39 | #include "../dccp.h" |
40 | #include "../packet_history.h" | 40 | #include "lib/packet_history.h" |
41 | #include "lib/loss_interval.h" | 41 | #include "lib/loss_interval.h" |
42 | #include "ccid3.h" | 42 | #include "ccid3.h" |
43 | 43 | ||
diff --git a/net/dccp/packet_history.c b/net/dccp/ccids/lib/packet_history.c index 2d9ef5ae0bf6..2d9ef5ae0bf6 100644 --- a/net/dccp/packet_history.c +++ b/net/dccp/ccids/lib/packet_history.c | |||
diff --git a/net/dccp/packet_history.h b/net/dccp/ccids/lib/packet_history.h index 2e5ba343e3dd..235828d822d9 100644 --- a/net/dccp/packet_history.h +++ b/net/dccp/ccids/lib/packet_history.h | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <linux/slab.h> | 42 | #include <linux/slab.h> |
43 | #include <linux/time.h> | 43 | #include <linux/time.h> |
44 | 44 | ||
45 | #include "dccp.h" | 45 | #include "../../dccp.h" |
46 | 46 | ||
47 | struct dccp_tx_hist_entry { | 47 | struct dccp_tx_hist_entry { |
48 | struct list_head dccphtx_node; | 48 | struct list_head dccphtx_node; |