From: Richard Sailer <richard_siegfried@systemli.org>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org
Subject: [PATCH net-next 2/3] tcp: Move cc algorithms to own subdirectory
Date: Wed, 4 Oct 2017 00:22:12 +0200 [thread overview]
Message-ID: <20171003222213.7996-3-richard_siegfried@systemli.org> (raw)
In-Reply-To: <20171003222213.7996-1-richard_siegfried@systemli.org>
Essentially the TCP code files consist of two groups:
* main code and some utilities (13 files)
* pluggable Congestion Control Algorithms (17 files)
Similar to the previous commit, this moves the Congestion control Algorithms to
a own subdirecty and updates the Makefiles accordingly to make the source tree
more well structured and self explaining.
Signed-off-by: Richard Sailer <richard_siegfried@systemli.org>
---
net/ipv4/tcp/Makefile | 18 ++----------------
net/ipv4/tcp/cc_algos/Makefile | 21 +++++++++++++++++++++
net/ipv4/tcp/{ => cc_algos}/tcp_bbr.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_bic.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_cdg.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_cubic.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_dctcp.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_highspeed.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_htcp.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_hybla.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_illinois.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_lp.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_nv.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_scalable.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_vegas.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_vegas.h | 0
net/ipv4/tcp/{ => cc_algos}/tcp_veno.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_westwood.c | 0
net/ipv4/tcp/{ => cc_algos}/tcp_yeah.c | 0
19 files changed, 23 insertions(+), 16 deletions(-)
create mode 100644 net/ipv4/tcp/cc_algos/Makefile
rename net/ipv4/tcp/{ => cc_algos}/tcp_bbr.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_bic.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_cdg.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_cubic.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_dctcp.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_highspeed.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_htcp.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_hybla.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_illinois.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_lp.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_nv.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_scalable.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_vegas.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_vegas.h (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_veno.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_westwood.c (100%)
rename net/ipv4/tcp/{ => cc_algos}/tcp_yeah.c (100%)
diff --git a/net/ipv4/tcp/Makefile b/net/ipv4/tcp/Makefile
index 91d2c991a243..60e96525a489 100644
--- a/net/ipv4/tcp/Makefile
+++ b/net/ipv4/tcp/Makefile
@@ -8,19 +8,5 @@ obj-y := tcp.o tcp_input.o tcp_output.o tcp_timer.o \
obj-$(CONFIG_INET_TCP_DIAG) += tcp_diag.o
obj-$(CONFIG_NET_TCPPROBE) += tcp_probe.o
-obj-$(CONFIG_TCP_CONG_BBR) += tcp_bbr.o
-obj-$(CONFIG_TCP_CONG_BIC) += tcp_bic.o
-obj-$(CONFIG_TCP_CONG_CDG) += tcp_cdg.o
-obj-$(CONFIG_TCP_CONG_CUBIC) += tcp_cubic.o
-obj-$(CONFIG_TCP_CONG_DCTCP) += tcp_dctcp.o
-obj-$(CONFIG_TCP_CONG_WESTWOOD) += tcp_westwood.o
-obj-$(CONFIG_TCP_CONG_HSTCP) += tcp_highspeed.o
-obj-$(CONFIG_TCP_CONG_HYBLA) += tcp_hybla.o
-obj-$(CONFIG_TCP_CONG_HTCP) += tcp_htcp.o
-obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o
-obj-$(CONFIG_TCP_CONG_NV) += tcp_nv.o
-obj-$(CONFIG_TCP_CONG_VENO) += tcp_veno.o
-obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
-obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
-obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
-obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
+
+obj-$(CONFIG_TCP_CONG_ADVANCED) += cc_algos/
diff --git a/net/ipv4/tcp/cc_algos/Makefile b/net/ipv4/tcp/cc_algos/Makefile
new file mode 100644
index 000000000000..81999dd2a045
--- /dev/null
+++ b/net/ipv4/tcp/cc_algos/Makefile
@@ -0,0 +1,21 @@
+#
+# Makefile for all pluggable TCP congestion control algorithms
+#
+
+
+obj-$(CONFIG_TCP_CONG_BBR) += tcp_bbr.o
+obj-$(CONFIG_TCP_CONG_BIC) += tcp_bic.o
+obj-$(CONFIG_TCP_CONG_CDG) += tcp_cdg.o
+obj-$(CONFIG_TCP_CONG_CUBIC) += tcp_cubic.o
+obj-$(CONFIG_TCP_CONG_DCTCP) += tcp_dctcp.o
+obj-$(CONFIG_TCP_CONG_WESTWOOD) += tcp_westwood.o
+obj-$(CONFIG_TCP_CONG_HSTCP) += tcp_highspeed.o
+obj-$(CONFIG_TCP_CONG_HYBLA) += tcp_hybla.o
+obj-$(CONFIG_TCP_CONG_HTCP) += tcp_htcp.o
+obj-$(CONFIG_TCP_CONG_VEGAS) += tcp_vegas.o
+obj-$(CONFIG_TCP_CONG_NV) += tcp_nv.o
+obj-$(CONFIG_TCP_CONG_VENO) += tcp_veno.o
+obj-$(CONFIG_TCP_CONG_SCALABLE) += tcp_scalable.o
+obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
+obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
+obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
diff --git a/net/ipv4/tcp/tcp_bbr.c b/net/ipv4/tcp/cc_algos/tcp_bbr.c
similarity index 100%
rename from net/ipv4/tcp/tcp_bbr.c
rename to net/ipv4/tcp/cc_algos/tcp_bbr.c
diff --git a/net/ipv4/tcp/tcp_bic.c b/net/ipv4/tcp/cc_algos/tcp_bic.c
similarity index 100%
rename from net/ipv4/tcp/tcp_bic.c
rename to net/ipv4/tcp/cc_algos/tcp_bic.c
diff --git a/net/ipv4/tcp/tcp_cdg.c b/net/ipv4/tcp/cc_algos/tcp_cdg.c
similarity index 100%
rename from net/ipv4/tcp/tcp_cdg.c
rename to net/ipv4/tcp/cc_algos/tcp_cdg.c
diff --git a/net/ipv4/tcp/tcp_cubic.c b/net/ipv4/tcp/cc_algos/tcp_cubic.c
similarity index 100%
rename from net/ipv4/tcp/tcp_cubic.c
rename to net/ipv4/tcp/cc_algos/tcp_cubic.c
diff --git a/net/ipv4/tcp/tcp_dctcp.c b/net/ipv4/tcp/cc_algos/tcp_dctcp.c
similarity index 100%
rename from net/ipv4/tcp/tcp_dctcp.c
rename to net/ipv4/tcp/cc_algos/tcp_dctcp.c
diff --git a/net/ipv4/tcp/tcp_highspeed.c b/net/ipv4/tcp/cc_algos/tcp_highspeed.c
similarity index 100%
rename from net/ipv4/tcp/tcp_highspeed.c
rename to net/ipv4/tcp/cc_algos/tcp_highspeed.c
diff --git a/net/ipv4/tcp/tcp_htcp.c b/net/ipv4/tcp/cc_algos/tcp_htcp.c
similarity index 100%
rename from net/ipv4/tcp/tcp_htcp.c
rename to net/ipv4/tcp/cc_algos/tcp_htcp.c
diff --git a/net/ipv4/tcp/tcp_hybla.c b/net/ipv4/tcp/cc_algos/tcp_hybla.c
similarity index 100%
rename from net/ipv4/tcp/tcp_hybla.c
rename to net/ipv4/tcp/cc_algos/tcp_hybla.c
diff --git a/net/ipv4/tcp/tcp_illinois.c b/net/ipv4/tcp/cc_algos/tcp_illinois.c
similarity index 100%
rename from net/ipv4/tcp/tcp_illinois.c
rename to net/ipv4/tcp/cc_algos/tcp_illinois.c
diff --git a/net/ipv4/tcp/tcp_lp.c b/net/ipv4/tcp/cc_algos/tcp_lp.c
similarity index 100%
rename from net/ipv4/tcp/tcp_lp.c
rename to net/ipv4/tcp/cc_algos/tcp_lp.c
diff --git a/net/ipv4/tcp/tcp_nv.c b/net/ipv4/tcp/cc_algos/tcp_nv.c
similarity index 100%
rename from net/ipv4/tcp/tcp_nv.c
rename to net/ipv4/tcp/cc_algos/tcp_nv.c
diff --git a/net/ipv4/tcp/tcp_scalable.c b/net/ipv4/tcp/cc_algos/tcp_scalable.c
similarity index 100%
rename from net/ipv4/tcp/tcp_scalable.c
rename to net/ipv4/tcp/cc_algos/tcp_scalable.c
diff --git a/net/ipv4/tcp/tcp_vegas.c b/net/ipv4/tcp/cc_algos/tcp_vegas.c
similarity index 100%
rename from net/ipv4/tcp/tcp_vegas.c
rename to net/ipv4/tcp/cc_algos/tcp_vegas.c
diff --git a/net/ipv4/tcp/tcp_vegas.h b/net/ipv4/tcp/cc_algos/tcp_vegas.h
similarity index 100%
rename from net/ipv4/tcp/tcp_vegas.h
rename to net/ipv4/tcp/cc_algos/tcp_vegas.h
diff --git a/net/ipv4/tcp/tcp_veno.c b/net/ipv4/tcp/cc_algos/tcp_veno.c
similarity index 100%
rename from net/ipv4/tcp/tcp_veno.c
rename to net/ipv4/tcp/cc_algos/tcp_veno.c
diff --git a/net/ipv4/tcp/tcp_westwood.c b/net/ipv4/tcp/cc_algos/tcp_westwood.c
similarity index 100%
rename from net/ipv4/tcp/tcp_westwood.c
rename to net/ipv4/tcp/cc_algos/tcp_westwood.c
diff --git a/net/ipv4/tcp/tcp_yeah.c b/net/ipv4/tcp/cc_algos/tcp_yeah.c
similarity index 100%
rename from net/ipv4/tcp/tcp_yeah.c
rename to net/ipv4/tcp/cc_algos/tcp_yeah.c
--
2.14.1
next prev parent reply other threads:[~2017-10-03 22:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-03 22:22 [PATCH net-next 0/3] A own subdirectory for shared TCP code Richard Sailer
2017-10-03 22:22 ` [PATCH net-next 1/3] net/ipv4: Move shared tcp code to own subdirectory Richard Sailer
2017-10-03 22:22 ` Richard Sailer [this message]
2017-10-03 22:22 ` [PATCH net-next 3/3] Move shared tcp code to net/ipv4v6shared Richard Sailer
[not found] ` <CAOaVG14r2Uwm+r17Oa9jwKj50vRr8=SqwXEmmGAeW8rHj3FgXg@mail.gmail.com>
2017-10-04 8:57 ` Richard Siegfried
2017-10-03 22:42 ` [PATCH net-next 0/3] A own subdirectory for shared TCP code Eric Dumazet
2017-10-03 23:03 ` David Miller
2017-10-04 18:54 ` Richard Siegfried
2017-10-04 20:27 ` Andrew Lunn
2017-10-05 13:17 ` Richard Siegfried
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171003222213.7996-3-richard_siegfried@systemli.org \
--to=richard_siegfried@systemli.org \
--cc=davem@davemloft.net \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.