diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-08-28 04:18:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-30 01:12:25 +0200 |
| commit | 4524b259541e1eea07020af825d8e7b0e4faaec5 (patch) | |
| tree | a0aee23c08b3f98f0e96183309afb2d43ca12bd6 /net | |
| parent | [CCID3]: Move the loss interval code to loss_interval.[ch] (diff) | |
| download | linux-4524b259541e1eea07020af825d8e7b0e4faaec5.tar.xz linux-4524b259541e1eea07020af825d8e7b0e4faaec5.zip | |
[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>
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 @@ 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/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 @@ 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/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 @@ #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/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 @@ #include <linux/slab.h> #include <linux/time.h> -#include "dccp.h" +#include "../../dccp.h" struct dccp_tx_hist_entry { struct list_head dccphtx_node; |