Remove some MPTCP-modules
Subsystems (2)
Christoph Paasch
cover Remove some MPTCP-modules
I had a bit of time, so just went through the code and removed some modules. These patches are based off of the mptcp-net-next repo's master.
I would like to get rid of fullmesh/ndiffports as well, but need to see if I can do it such that I can run the net-next kernel on the server-side and still have my test-scripts succeed.
Also, a next series could get rid of the scheduler module-selector.
2500 lines of code gone! ;-)
Christoph Paasch (9):
mptcp: Remove Balia congestion control
mptcp: Remove wVegas congestion control
mptcp: Remove OLIA congestion control
mptcp: Remove Coupled congestion control
mptcp: Remove MCTCP Desync congestion control
mptcp: Remove Redundant scheduler
mptcp: Remove RoundRobin Scheduler
mptcp: Remove Binder Path-Manager
mptcp: Cleanup after removals
include/net/mptcp.h | 12 +- net/ipv4/Kconfig | 45 ---- net/mptcp/Kconfig | 40 +--- net/mptcp/Makefile | 8 - net/mptcp/mctcp_desync.c | 189 ----------------- net/mptcp/mptcp_balia.c | 268 ------------------------ net/mptcp/mptcp_binder.c | 486 -------------------------------------------- net/mptcp/mptcp_coupled.c | 271 ------------------------ net/mptcp/mptcp_ctrl.c | 3 - net/mptcp/mptcp_ipv4.c | 3 - net/mptcp/mptcp_ipv6.c | 3 - net/mptcp/mptcp_olia.c | 310 ---------------------------- net/mptcp/mptcp_redundant.c | 301 --------------------------- net/mptcp/mptcp_rr.c | 301 --------------------------- net/mptcp/mptcp_sched.c | 20 +- net/mptcp/mptcp_wvegas.c | 270 ------------------------ 16 files changed, 10 insertions(+), 2520 deletions(-) delete mode 100644 net/mptcp/mctcp_desync.c delete mode 100644 net/mptcp/mptcp_balia.c delete mode 100644 net/mptcp/mptcp_binder.c delete mode 100644 net/mptcp/mptcp_coupled.c delete mode 100644 net/mptcp/mptcp_olia.c delete mode 100644 net/mptcp/mptcp_redundant.c delete mode 100644 net/mptcp/mptcp_rr.c delete mode 100644 net/mptcp/mptcp_wvegas.c
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 1/9 mptcp: Remove Balia congestion control
--- net/ipv4/Kconfig | 8 -- net/mptcp/Makefile | 1 - net/mptcp/mptcp_balia.c | 268 ------------------------------------------------ 3 files changed, 277 deletions(-) delete mode 100644 net/mptcp/mptcp_balia.c
net/ipv4/Kconfig +0 -8
@@ -704,14 +704,6 @@ config TCP_CONG_WVEGAS wVegas congestion control for MPTCP To enable it, just put 'wvegas' in tcp_congestion_control -config TCP_CONG_BALIA - tristate "MPTCP BALIA CONGESTION CONTROL" - depends on MPTCP - default n - ---help--- - Multipath TCP Balanced Linked Adaptation Congestion Control - To enable it, just put 'balia' in tcp_congestion_control - config TCP_CONG_MCTCPDESYNC tristate "DESYNCHRONIZED MCTCP CONGESTION CONTROL (EXPERIMENTAL)" depends on MPTCP
net/mptcp/Makefile +0 -1
@@ -11,7 +11,6 @@ mptcp-y := mptcp_ctrl.o mptcp_ipv4.o mptcp_pm.o \ obj-$(CONFIG_TCP_CONG_LIA) += mptcp_coupled.o obj-$(CONFIG_TCP_CONG_OLIA) += mptcp_olia.o obj-$(CONFIG_TCP_CONG_WVEGAS) += mptcp_wvegas.o -obj-$(CONFIG_TCP_CONG_BALIA) += mptcp_balia.o obj-$(CONFIG_TCP_CONG_MCTCPDESYNC) += mctcp_desync.o obj-$(CONFIG_MPTCP_FULLMESH) += mptcp_fullmesh.o obj-$(CONFIG_MPTCP_NDIFFPORTS) += mptcp_ndiffports.o
net/mptcp/mptcp_balia.c deleted +0 -268
268 lines not on this page · raw message
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 2/9 mptcp: Remove wVegas congestion control
In reply to Christoph Paasch--- net/ipv4/Kconfig | 8 -- net/mptcp/Makefile | 1 - net/mptcp/mptcp_wvegas.c | 270 ----------------------------------------------- 3 files changed, 279 deletions(-) delete mode 100644 net/mptcp/mptcp_wvegas.c
net/ipv4/Kconfig +0 -8
@@ -696,14 +696,6 @@ config TCP_CONG_OLIA MultiPath TCP Opportunistic Linked Increase Congestion Control To enable it, just put 'olia' in tcp_congestion_control -config TCP_CONG_WVEGAS - tristate "MPTCP WVEGAS CONGESTION CONTROL" - depends on MPTCP - default n - ---help--- - wVegas congestion control for MPTCP - To enable it, just put 'wvegas' in tcp_congestion_control - config TCP_CONG_MCTCPDESYNC tristate "DESYNCHRONIZED MCTCP CONGESTION CONTROL (EXPERIMENTAL)" depends on MPTCP
net/mptcp/Makefile +0 -1
@@ -10,7 +10,6 @@ mptcp-y := mptcp_ctrl.o mptcp_ipv4.o mptcp_pm.o \ obj-$(CONFIG_TCP_CONG_LIA) += mptcp_coupled.o obj-$(CONFIG_TCP_CONG_OLIA) += mptcp_olia.o -obj-$(CONFIG_TCP_CONG_WVEGAS) += mptcp_wvegas.o obj-$(CONFIG_TCP_CONG_MCTCPDESYNC) += mctcp_desync.o obj-$(CONFIG_MPTCP_FULLMESH) += mptcp_fullmesh.o obj-$(CONFIG_MPTCP_NDIFFPORTS) += mptcp_ndiffports.o
net/mptcp/mptcp_wvegas.c deleted +0 -270
270 lines not on this page · raw message
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 3/9 mptcp: Remove OLIA congestion control
In reply to Christoph Paasch--- net/ipv4/Kconfig | 8 -- net/mptcp/Makefile | 1 - net/mptcp/mptcp_olia.c | 310 ------------------------------------------------- 3 files changed, 319 deletions(-) delete mode 100644 net/mptcp/mptcp_olia.c
net/ipv4/Kconfig +0 -8
@@ -688,14 +688,6 @@ config TCP_CONG_LIA MultiPath TCP Linked Increase Congestion Control To enable it, just put 'lia' in tcp_congestion_control -config TCP_CONG_OLIA - tristate "MPTCP Opportunistic Linked Increase" - depends on MPTCP - default n - ---help--- - MultiPath TCP Opportunistic Linked Increase Congestion Control - To enable it, just put 'olia' in tcp_congestion_control - config TCP_CONG_MCTCPDESYNC tristate "DESYNCHRONIZED MCTCP CONGESTION CONTROL (EXPERIMENTAL)" depends on MPTCP
net/mptcp/Makefile +0 -1
@@ -9,7 +9,6 @@ mptcp-y := mptcp_ctrl.o mptcp_ipv4.o mptcp_pm.o \ mptcp_output.o mptcp_input.o mptcp_sched.o obj-$(CONFIG_TCP_CONG_LIA) += mptcp_coupled.o -obj-$(CONFIG_TCP_CONG_OLIA) += mptcp_olia.o obj-$(CONFIG_TCP_CONG_MCTCPDESYNC) += mctcp_desync.o obj-$(CONFIG_MPTCP_FULLMESH) += mptcp_fullmesh.o obj-$(CONFIG_MPTCP_NDIFFPORTS) += mptcp_ndiffports.o
net/mptcp/mptcp_olia.c deleted +0 -310
310 lines not on this page · raw message
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 4/9 mptcp: Remove Coupled congestion control
In reply to Christoph Paasch--- net/ipv4/Kconfig | 8 -- net/mptcp/Makefile | 1 - net/mptcp/mptcp_coupled.c | 271 ---------------------------------------------- 3 files changed, 280 deletions(-) delete mode 100644 net/mptcp/mptcp_coupled.c
net/ipv4/Kconfig +0 -8
@@ -680,14 +680,6 @@ config TCP_CONG_BBR bufferbloat, policers, or AQM schemes that do not provide a delay signal. It requires the fq ("Fair Queue") pacing packet scheduler. -config TCP_CONG_LIA - tristate "MPTCP Linked Increase" - depends on MPTCP - default n - ---help--- - MultiPath TCP Linked Increase Congestion Control - To enable it, just put 'lia' in tcp_congestion_control - config TCP_CONG_MCTCPDESYNC tristate "DESYNCHRONIZED MCTCP CONGESTION CONTROL (EXPERIMENTAL)" depends on MPTCP
net/mptcp/Makefile +0 -1
@@ -8,7 +8,6 @@ obj-$(CONFIG_MPTCP) += mptcp.o mptcp-y := mptcp_ctrl.o mptcp_ipv4.o mptcp_pm.o \ mptcp_output.o mptcp_input.o mptcp_sched.o -obj-$(CONFIG_TCP_CONG_LIA) += mptcp_coupled.o obj-$(CONFIG_TCP_CONG_MCTCPDESYNC) += mctcp_desync.o obj-$(CONFIG_MPTCP_FULLMESH) += mptcp_fullmesh.o obj-$(CONFIG_MPTCP_NDIFFPORTS) += mptcp_ndiffports.o
net/mptcp/mptcp_coupled.c deleted +0 -271
271 lines not on this page · raw message
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 5/9 mptcp: Remove MCTCP Desync congestion control
In reply to Christoph Paasch--- net/ipv4/Kconfig | 13 ---- net/mptcp/Makefile | 1 - net/mptcp/mctcp_desync.c | 189 ----------------------------------------------- 3 files changed, 203 deletions(-) delete mode 100644 net/mptcp/mctcp_desync.c
net/ipv4/Kconfig +0 -13
@@ -680,19 +680,6 @@ config TCP_CONG_BBR bufferbloat, policers, or AQM schemes that do not provide a delay signal. It requires the fq ("Fair Queue") pacing packet scheduler. -config TCP_CONG_MCTCPDESYNC - tristate "DESYNCHRONIZED MCTCP CONGESTION CONTROL (EXPERIMENTAL)" - depends on MPTCP - default n - ---help--- - Desynchronized MultiChannel TCP Congestion Control. This is experimental - code that only supports single path and must have set mptcp_ndiffports - larger than one. - To enable it, just put 'mctcpdesync' in tcp_congestion_control - For further details see: - http://ieeexplore.ieee.org/abstract/document/6911722/ - https://doi.org/10.1016/j.comcom.2015.07.010 - choice prompt "Default TCP congestion control" default DEFAULT_CUBIC
net/mptcp/Makefile +0 -1
@@ -8,7 +8,6 @@ obj-$(CONFIG_MPTCP) += mptcp.o mptcp-y := mptcp_ctrl.o mptcp_ipv4.o mptcp_pm.o \ mptcp_output.o mptcp_input.o mptcp_sched.o -obj-$(CONFIG_TCP_CONG_MCTCPDESYNC) += mctcp_desync.o obj-$(CONFIG_MPTCP_FULLMESH) += mptcp_fullmesh.o obj-$(CONFIG_MPTCP_NDIFFPORTS) += mptcp_ndiffports.o obj-$(CONFIG_MPTCP_BINDER) += mptcp_binder.o
net/mptcp/mctcp_desync.c deleted +0 -189
189 lines not on this page · raw message
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 6/9 mptcp: Remove Redundant scheduler
In reply to Christoph Paasch--- net/mptcp/Kconfig | 13 -- net/mptcp/Makefile | 1 - net/mptcp/mptcp_redundant.c | 301 -------------------------------------------- 3 files changed, 315 deletions(-) delete mode 100644 net/mptcp/mptcp_redundant.c
net/mptcp/Kconfig +0 -13
@@ -85,13 +85,6 @@ config MPTCP_ROUNDROBIN This is a very simple round-robin scheduler. Probably has bad performance but might be interesting for researchers. -config MPTCP_REDUNDANT - tristate "MPTCP Redundant" - depends on (MPTCP=y) - ---help--- - This scheduler sends all packets redundantly over all subflows to decreases - latency and jitter on the cost of lower throughput. - choice prompt "Default MPTCP Scheduler" default DEFAULT
@@ -110,12 +103,6 @@ choice This is the round-rob scheduler, sending in a round-robin fashion.. - config DEFAULT_REDUNDANT - bool "Redundant" if MPTCP_REDUNDANT=y - ---help--- - This is the redundant scheduler, sending packets redundantly over - all the subflows. - endchoice endif
net/mptcp/Makefile +0 -1
@@ -12,7 +12,6 @@ obj-$(CONFIG_MPTCP_FULLMESH) += mptcp_fullmesh.o obj-$(CONFIG_MPTCP_NDIFFPORTS) += mptcp_ndiffports.o obj-$(CONFIG_MPTCP_BINDER) += mptcp_binder.o obj-$(CONFIG_MPTCP_ROUNDROBIN) += mptcp_rr.o -obj-$(CONFIG_MPTCP_REDUNDANT) += mptcp_redundant.o mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o
net/mptcp/mptcp_redundant.c deleted +0 -301
301 lines not on this page · raw message
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 7/9 mptcp: Remove RoundRobin Scheduler
In reply to Christoph Paasch--- net/mptcp/Kconfig | 13 --- net/mptcp/Makefile | 1 - net/mptcp/mptcp_rr.c | 301 --------------------------------------------------- 3 files changed, 315 deletions(-) delete mode 100644 net/mptcp/mptcp_rr.c
net/mptcp/Kconfig +0 -13
@@ -78,13 +78,6 @@ menuconfig MPTCP_SCHED_ADVANCED if MPTCP_SCHED_ADVANCED -config MPTCP_ROUNDROBIN - tristate "MPTCP Round-Robin" - depends on (MPTCP=y) - ---help--- - This is a very simple round-robin scheduler. Probably has bad performance - but might be interesting for researchers. - choice prompt "Default MPTCP Scheduler" default DEFAULT
@@ -97,12 +90,6 @@ choice This is the default scheduler, sending first on the subflow with the lowest RTT. - config DEFAULT_ROUNDROBIN - bool "Round-Robin" if MPTCP_ROUNDROBIN=y - ---help--- - This is the round-rob scheduler, sending in a round-robin - fashion.. - endchoice endif
net/mptcp/Makefile +0 -1
@@ -11,7 +11,6 @@ mptcp-y := mptcp_ctrl.o mptcp_ipv4.o mptcp_pm.o \ obj-$(CONFIG_MPTCP_FULLMESH) += mptcp_fullmesh.o obj-$(CONFIG_MPTCP_NDIFFPORTS) += mptcp_ndiffports.o obj-$(CONFIG_MPTCP_BINDER) += mptcp_binder.o -obj-$(CONFIG_MPTCP_ROUNDROBIN) += mptcp_rr.o mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o
net/mptcp/mptcp_rr.c deleted +0 -301
301 lines not on this page · raw message
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 8/9 mptcp: Remove Binder Path-Manager
In reply to Christoph Paasch--- net/mptcp/Kconfig | 14 +- net/mptcp/Makefile | 1 - net/mptcp/mptcp_binder.c | 486 ----------------------------------------------- 3 files changed, 1 insertion(+), 500 deletions(-) delete mode 100644 net/mptcp/mptcp_binder.c
net/mptcp/Kconfig +1 -13
@@ -31,14 +31,6 @@ config MPTCP_NDIFFPORTS pair of IP-addresses, modifying the source-port. You can set the number of subflows via the mptcp_ndiffports-sysctl. -config MPTCP_BINDER - tristate "MPTCP Binder" - depends on (MPTCP=y) - ---help--- - This path-management module works like ndiffports, and adds the sysctl - option to set the gateway (and/or path to) per each additional subflow - via Loose Source Routing (IPv4 only). - choice prompt "Default MPTCP Path-Manager" default DEFAULT
@@ -51,9 +43,6 @@ choice config DEFAULT_NDIFFPORTS bool "ndiff-ports" if MPTCP_NDIFFPORTS=y - config DEFAULT_BINDER - bool "binder" if MPTCP_BINDER=y - config DEFAULT_DUMMY bool "Default"
@@ -64,9 +53,8 @@ endif config DEFAULT_MPTCP_PM string default "default" if DEFAULT_DUMMY - default "fullmesh" if DEFAULT_FULLMESH + default "fullmesh" if DEFAULT_FULLMESH default "ndiffports" if DEFAULT_NDIFFPORTS - default "binder" if DEFAULT_BINDER default "default" menuconfig MPTCP_SCHED_ADVANCED
net/mptcp/Makefile +0 -1
@@ -10,7 +10,6 @@ mptcp-y := mptcp_ctrl.o mptcp_ipv4.o mptcp_pm.o \ obj-$(CONFIG_MPTCP_FULLMESH) += mptcp_fullmesh.o obj-$(CONFIG_MPTCP_NDIFFPORTS) += mptcp_ndiffports.o -obj-$(CONFIG_MPTCP_BINDER) += mptcp_binder.o mptcp-$(subst m,y,$(CONFIG_IPV6)) += mptcp_ipv6.o
net/mptcp/mptcp_binder.c deleted +0 -486
486 lines not on this page · raw message
Signature · 1 line
2.16.2
Christoph Paasch
PATCH 9/9 mptcp: Cleanup after removals
In reply to Christoph PaaschNow that those modules have been removed, we can get rid of some of the unused callbacks, fields and memory.
Make also some of the functions static that are now only used in mptcp_sched.c.
--- include/net/mptcp.h | 12 +----------- net/mptcp/mptcp_ctrl.c | 3 --- net/mptcp/mptcp_ipv4.c | 3 --- net/mptcp/mptcp_ipv6.c | 3 --- net/mptcp/mptcp_sched.c | 20 ++++++++------------ 5 files changed, 9 insertions(+), 32 deletions(-)
include/net/mptcp.h +1 -11
@@ -187,7 +187,7 @@ struct mptcp_tcp_sock {u8 loc_id;u8 rem_id; -#define MPTCP_SCHED_SIZE 16 +#define MPTCP_SCHED_SIZE 4u8 mptcp_sched[MPTCP_SCHED_SIZE ]__aligned(8) ;int init_rcv_wnd;
@@ -230,8 +230,6 @@ struct mptcp_pm_ops {void (*add_raddr)(struct mptcp_cb *mpcb,const union inet_addr *addr,sa_family_t family,__be16 port,u8 id);void (*rem_raddr)(struct mptcp_cb *mpcb,u8 rem_id); -void (*init_subsocket_v4)(struct sock *sk,struct in_addr addr); -void (*init_subsocket_v6)(struct sock *sk,struct in6_addr addr);void (*delete_subflow)(struct sock *sk);char name[MPTCP_PM_NAME_MAX ];
@@ -250,7 +248,6 @@ struct mptcp_sched_ops {struct sock **subsk, unsigned int *limit);void (*init)(struct sock *sk); -void (*release)(struct sock *sk);char name[MPTCP_SCHED_NAME_MAX ];struct module *owner;
@@ -902,13 +899,6 @@ void mptcp_init_scheduler(struct mptcp_cb *mpcb);void mptcp_cleanup_scheduler (struct mptcp_cb *mpcb);void mptcp_get_default_scheduler (char *name);int mptcp_set_default_scheduler (const char *name); -bool mptcp_is_available (struct sock *sk,const struct sk_buff *skb, -bool zero_wnd_test); -bool mptcp_is_def_unavailable (struct sock *sk); -bool subflow_is_active (const struct tcp_sock *tp); -bool subflow_is_backup (const struct tcp_sock *tp); -struct sock *get_available_subflow (struct sock *meta_sk,struct sk_buff *skb, -bool zero_wnd_test);extern struct mptcp_sched_ops mptcp_sched_default;/* Initializes function-pointers and MPTCP-flags */
net/mptcp/mptcp_ctrl.c +0 -3
@@ -1412,9 +1412,6 @@ void mptcp_del_sock(struct sock *sk) mpcb = tp->mpcb; tp_prev = mpcb->connection_list; -if (mpcb->sched_ops->release) - mpcb->sched_ops->release (sk); -if (mpcb->pm_ops->delete_subflow) mpcb->pm_ops->delete_subflow (sk);
net/mptcp/mptcp_ipv4.c +0 -3
@@ -340,9 +340,6 @@ int mptcp_init4_subsockets(struct sock *meta_sk, const struct mptcp_loc4 *loc,ntohs (loc_in.sin_port), &rem_in.sin_addr, ntohs(rem_in.sin_port), loc->if_idx); -if (tcp_sk (meta_sk)->mpcb->pm_ops->init_subsocket_v4) -tcp_sk (meta_sk)->mpcb->pm_ops->init_subsocket_v4 (sk, rem->addr); - ret =kernel_connect (sock, (struct sockaddr *)&rem_in,sizeof (struct sockaddr_in ),O_NONBLOCK );if (ret <0 && ret != -EINPROGRESS ) {
net/mptcp/mptcp_ipv6.c +0 -3
@@ -348,9 +348,6 @@ int mptcp_init6_subsockets(struct sock *meta_sk, const struct mptcp_loc6 *loc,ntohs (loc_in.sin6_port), &rem_in.sin6_addr, ntohs(rem_in.sin6_port), loc->if_idx); -if (tcp_sk (meta_sk)->mpcb->pm_ops->init_subsocket_v6) -tcp_sk (meta_sk)->mpcb->pm_ops->init_subsocket_v6 (sk, rem->addr); - ret =kernel_connect (sock, (struct sockaddr *)&rem_in,sizeof (struct sockaddr_in6 ),O_NONBLOCK );if (ret <0 && ret != -EINPROGRESS ) {
net/mptcp/mptcp_sched.c +8 -12
@@ -15,7 +15,7 @@ static struct defsched_priv *defsched_get_priv(const struct tcp_sock *tp)return (struct defsched_priv *)&tp->mptcp->mptcp_sched[0 ]; } -bool mptcp_is_def_unavailable (struct sock *sk) +static bool mptcp_is_def_unavailable (struct sock *sk) {const struct tcp_sock *tp =tcp_sk (sk);
@@ -34,7 +34,6 @@ bool mptcp_is_def_unavailable(struct sock *sk)return false; } -EXPORT_SYMBOL_GPL (mptcp_is_def_unavailable); static bool mptcp_is_temp_unavailable(struct sock *sk, const struct sk_buff *skb,
@@ -96,13 +95,12 @@ static bool mptcp_is_temp_unavailable(struct sock *sk, }/* Is the sub-socket sk available to send the skb? */ -bool mptcp_is_available (struct sock *sk,const struct sk_buff *skb, -bool zero_wnd_test) +static bool mptcp_is_available (struct sock *sk,const struct sk_buff *skb, +bool zero_wnd_test) {return !mptcp_is_def_unavailable (sk) && !mptcp_is_temp_unavailable (sk, skb, zero_wnd_test); } -EXPORT_SYMBOL_GPL (mptcp_is_available);/* Are we not allowed to reinject this skb on tp? */ static int mptcp_dont_reinject_skb (const struct tcp_sock *tp,const struct sk_buff *skb)
@@ -115,17 +113,15 @@ static int mptcp_dont_reinject_skb(const struct tcp_sock *tp, const struct sk_bumptcp_pi_to_flag (tp->mptcp->path_index) &TCP_SKB_CB (skb)->path_mask; } -bool subflow_is_backup (const struct tcp_sock *tp) +static bool subflow_is_backup (const struct tcp_sock *tp) {return tp->mptcp->rcv_low_prio || tp->mptcp->low_prio; } -EXPORT_SYMBOL_GPL (subflow_is_backup); -bool subflow_is_active (const struct tcp_sock *tp) +static bool subflow_is_active (const struct tcp_sock *tp) {return !tp->mptcp->rcv_low_prio && !tp->mptcp->low_prio; } -EXPORT_SYMBOL_GPL (subflow_is_active);/* Generic function to iterate over used and unused subflows and to select the * best one
@@ -212,8 +208,9 @@ static struct sock* * Additionally, this function is aware of the backup-subflows. */ -struct sock *get_available_subflow (struct sock *meta_sk,struct sk_buff *skb, -bool zero_wnd_test) +static struct sock *get_available_subflow (struct sock *meta_sk, +struct sk_buff *skb, +bool zero_wnd_test) {struct mptcp_cb *mpcb =tcp_sk (meta_sk)->mpcb;struct sock *sk;
@@ -258,7 +255,6 @@ struct sock *get_available_subflow(struct sock *meta_sk, struct sk_buff *skb,TCP_SKB_CB (skb)->path_mask =0 ;return sk; } -EXPORT_SYMBOL_GPL (get_available_subflow);static struct sk_buff *mptcp_rcv_buf_optimization (struct sock *sk,int penal) {
Signature · 1 line
2.16.2
Mat Martineau
Quoted 11 lines · Christoph Paasch
I had a bit of time, so just went through the code and removed some modules. These patches are based off of the mptcp-net-next repo's master.
I would like to get rid of fullmesh/ndiffports as well, but need to see if I can do it such that I can run the net-next kernel on the server-side and still have my test-scripts succeed.
Also, a next series could get rid of the scheduler module-selector.
2500 lines of code gone! ;-)
Quoted 10 lines
Christoph Paasch (9):
mptcp: Remove Balia congestion control
mptcp: Remove wVegas congestion control
mptcp: Remove OLIA congestion control
mptcp: Remove Coupled congestion control
mptcp: Remove MCTCP Desync congestion control
mptcp: Remove Redundant scheduler
mptcp: Remove RoundRobin Scheduler
mptcp: Remove Binder Path-Manager
mptcp: Cleanup after removals
Thanks Christoph - all applied.
--
Mat Martineau
Intel OTC