Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4524b259 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae6706f0

net/dccp/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_IP_DCCP) += dccp.o

obj-$(CONFIG_IP_DCCP) += dccp.o





dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.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

obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o

net/dccp/ccids/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid3.o

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

net/dccp/ccids/ccid3.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/config.h>

#include <linux/config.h>

#include "../ccid.h"

#include "../ccid.h"

#include "../dccp.h"

#include "../dccp.h"

#include "../packet_history.h"

#include "lib/packet_history.h"

#include "lib/loss_interval.h"

#include "lib/loss_interval.h"

#include "ccid3.h"

#include "ccid3.h"

net/dccp/packet_history.h→net/dccp/ccids/lib/packet_history.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/time.h>

#include <linux/time.h>





#include "dccp.h"

#include "../../dccp.h"





struct dccp_tx_hist_entry {

struct dccp_tx_hist_entry {

	struct list_head dccphtx_node;

	struct list_head dccphtx_node;