[PATCH v1] Squash-to: "tcp: Prevent coalesce/collapse when skb has MPTCP extensions"
by Paolo Abeni
Allow coalescing when mptcp extensions are equal or 'from' lacks such extensions.
Note: we could be a little less restrictive allowing coalescing with
different data_ack, but this simplify the code a bit, we can improve
later and at least mptcp_net-next do not generate almost identical
DSS with different data_ack.
With the above assumption, we don't need any special action when
moving bits from skb1 to skb2, as the mapping in skb2 will already
fit, and mapping in skb1 will be dropped as/if needed.
When coalescing to a newly allocated skb, we transfer the relevant
extension to. An MPTCP specific helper is added for that goal,
possibly we could use/create a generic one.
RFC -> v1:
- changed helpers checks as per Florian && Mat feedback
- added comments (Florian)
- fixed check in tcp_try_coalesce() (Mat)
- fixed memcpy (Mat && Florian)
- dropped now unused mptcp_skb_ext_exist()
- move the mptcp_skb_can_collapse() into the 2nd group of checks in
tcp_coalese()
This latter point is somewhat relevant. An unpatched kernel allows
collapsing a single skb with 'old' bits (seq lower than 'start'). Than
really means shrink a bit the current skb, possibly without any fourther
action. This change preserve this behavior, but add the restriction to
respect MPTCP coalescing test when trying to collapsing to the next one.
Overall consequences are not 110% clear to me!
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
include/net/mptcp.h | 45 ++++++++++++++++++++++++++++++++++++++++----
include/net/tcp.h | 2 +-
net/ipv4/tcp_input.c | 13 ++++++-------
3 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 43ddfdf9e4a3..f0b8ee40fe5a 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -27,16 +27,53 @@ struct mptcp_ext {
#ifdef CONFIG_MPTCP
-static inline bool mptcp_skb_ext_exist(const struct sk_buff *skb)
+/* move the skb extension owership, with the assumption that 'to' is
+ * newly allocated and 'from' carries only MPTCP ext
+ */
+static inline void mptcp_skb_ext_move(struct sk_buff *to,
+ struct sk_buff *from)
+{
+ if (WARN_ON_ONCE(to->active_extensions))
+ skb_ext_put(to);
+ WARN_ON_ONCE(from->active_extensions & ~(1 << SKB_EXT_MPTCP));
+
+ to->active_extensions = from->active_extensions;
+ to->extensions = from->extensions;
+ from->extensions = NULL;
+ from->active_extensions = 0;
+}
+
+static inline bool mptcp_ext_matches(const struct mptcp_ext *to_ext,
+ const struct mptcp_ext *from_ext)
+{
+ return to_ext == from_ext ||
+ (to_ext && from_ext &&
+ !memcmp(from_ext, to_ext, sizeof(struct mptcp_ext)));
+}
+
+/* check if skbs can be collapsed.
+ * MPTCP collapse is allowed if neither @to or @from carry an mptcp data
+ * mapping, or if the extension of @to is the same as @from.
+ * Collapsing is not possible if @to lacks an extension, but @from carries one.
+ */
+static inline bool mptcp_skb_can_collapse(const struct sk_buff *to,
+ const struct sk_buff *from)
{
- return skb_ext_exist(skb, SKB_EXT_MPTCP);
+ return mptcp_ext_matches(skb_ext_find(to, SKB_EXT_MPTCP),
+ skb_ext_find(from, SKB_EXT_MPTCP));
}
#else
-static inline bool mptcp_skb_ext_exist(const struct sk_buff *skb)
+static inline void mptcp_skb_ext_move(struct sk_buff *to,
+ const struct sk_buff *from)
+{
+}
+
+static inline bool mptcp_skb_can_collapse(const struct sk_buff *to,
+ const struct sk_buff *from)
{
- return false;
+ return true;
}
#endif /* CONFIG_MPTCP */
diff --git a/include/net/tcp.h b/include/net/tcp.h
index c483c73b8d41..f4cddd42d52a 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -983,7 +983,7 @@ static inline bool tcp_skb_can_collapse(const struct sk_buff *to,
const struct sk_buff *from)
{
return likely(tcp_skb_can_collapse_to(to) &&
- !mptcp_skb_ext_exist(from));
+ mptcp_skb_can_collapse(to, from));
}
/* Events passed to congestion control interface */
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 55b460a2ece2..a16d9f2a0529 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4420,7 +4420,7 @@ static bool tcp_try_coalesce(struct sock *sk,
if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq)
return false;
- if (mptcp_skb_ext_exist(from))
+ if (!mptcp_skb_can_collapse(to, from))
return false;
#ifdef CONFIG_TLS_DEVICE
@@ -4931,19 +4931,17 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,
/* The first skb to collapse is:
* - not SYN/FIN and
- * - does not include a MPTCP skb extension
* - bloated or contains data before "start" or
- * overlaps to the next one.
+ * overlaps to the next one and mptcp allow collapsing.
*/
if (!(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)) &&
- !mptcp_skb_ext_exist(skb) &&
(tcp_win_from_space(sk, skb->truesize) > skb->len ||
before(TCP_SKB_CB(skb)->seq, start))) {
end_of_skbs = false;
break;
}
- if (n && n != tail &&
+ if (n && n != tail && mptcp_skb_can_collapse(skb, n) &&
TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(n)->seq) {
end_of_skbs = false;
break;
@@ -4952,7 +4950,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,
/* Decided to skip this, advance start seq. */
start = TCP_SKB_CB(skb)->end_seq;
}
- if (end_of_skbs || mptcp_skb_ext_exist(skb) ||
+ if (end_of_skbs ||
(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)))
return;
@@ -4976,6 +4974,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,
else
__skb_queue_tail(&tmp, nskb); /* defer rbtree insertion */
skb_set_owner_r(nskb, sk);
+ mptcp_skb_ext_move(nskb, skb);
/* Copy data, releasing collapsed skbs. */
while (copy > 0) {
@@ -4995,7 +4994,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,
skb = tcp_collapse_one(sk, skb, list, root);
if (!skb ||
skb == tail ||
- mptcp_skb_ext_exist(skb) ||
+ !mptcp_skb_can_collapse(nskb, skb) ||
(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)))
goto end;
#ifdef CONFIG_TLS_DEVICE
--
2.21.0
9 months
[RFC PATCH] Squash-to: "tcp: Prevent coalesce/collapse when skb has MPTCP extensions"
by Paolo Abeni
Allow coalescing when mptcp extensions are equal or 'from' lacks such extensions.
Note: we could be a little less restrictive allowing coalescing with
different data_ack, but this simplify the code a bit, we can improve
later and at least mptcp_net-next do not generate almost identical
DSS with different data_ack.
With the above assumption, we don't need any special action when
moving bits from skb1 to skb2, as the mapping in skb2 will already
fit, and mapping in skb1 will be dropped as/if needed.
When coalescing to a newly allocated skb, we transfer the relevant
extension to. An MPTCP specific helper is added for that goal,
possibly we could use/create a generic one.
Completely untested, just to collect early feedback.
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
include/net/mptcp.h | 38 ++++++++++++++++++++++++++++++++++++++
include/net/tcp.h | 2 +-
net/ipv4/tcp_input.c | 9 +++++----
3 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 43ddfdf9e4a3..8a702e7566e6 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -27,17 +27,55 @@ struct mptcp_ext {
#ifdef CONFIG_MPTCP
+static inline void mptcp_skb_ext_move(struct sk_buff *to,
+ const struct sk_buff *from)
+{
+ skb_ext_put(to);
+
+ to->active_extensions = from->active_extensions;
+ to->extensions = from->extensions;
+ from->extensions = NULL;
+ from->active_extensions = 0;
+}
+
static inline bool mptcp_skb_ext_exist(const struct sk_buff *skb)
{
return skb_ext_exist(skb, SKB_EXT_MPTCP);
}
+static inline bool mptcp_ext_matches(const struct mptcp_ext *to_ext,
+ const struct mptcp_ext *from_ext)
+{
+ return !memcmp(&from_ext->data_seq, &to_ext->data_seq);
+}
+
+static inline bool mptcp_skb_can_collapse(const struct sk_buff *to,
+ const struct sk_buff *from)
+{
+ const struct mptcp_ext *from_ext = skb_ext_find(from, SKB_EXT_MPTCP);
+ const struct mptcp_ext *to_ext = skb_ext_find(to, SKB_EXT_MPTCP);
+
+ return !from_ext || (to_ext && mptcp_ext_matches(to_ext, from_ext));
+}
+
#else
+static inline void mptcp_skb_ext_move(struct sk_buff *to,
+ const struct sk_buff *from)
+{
+}
+
static inline bool mptcp_skb_ext_exist(const struct sk_buff *skb)
{
return false;
}
+static inline bool mptcp_skb_can_collapse(const struct sk_buff *to,
+ const struct sk_buff *from)
+{
+ return true;
+}
+
+
#endif /* CONFIG_MPTCP */
#endif /* __NET_MPTCP_H */
diff --git a/include/net/tcp.h b/include/net/tcp.h
index c483c73b8d41..f4cddd42d52a 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -983,7 +983,7 @@ static inline bool tcp_skb_can_collapse(const struct sk_buff *to,
const struct sk_buff *from)
{
return likely(tcp_skb_can_collapse_to(to) &&
- !mptcp_skb_ext_exist(from));
+ mptcp_skb_can_collapse(to, from));
}
/* Events passed to congestion control interface */
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 55b460a2ece2..1c96c545a23a 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4420,7 +4420,7 @@ static bool tcp_try_coalesce(struct sock *sk,
if (TCP_SKB_CB(from)->seq != TCP_SKB_CB(to)->end_seq)
return false;
- if (mptcp_skb_ext_exist(from))
+ if (mptcp_skb_can_collapse(to, from))
return false;
#ifdef CONFIG_TLS_DEVICE
@@ -4931,12 +4931,12 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,
/* The first skb to collapse is:
* - not SYN/FIN and
- * - does not include a MPTCP skb extension
+ * - MPTCP allow collapsing with the next one, if any
* - bloated or contains data before "start" or
* overlaps to the next one.
*/
if (!(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)) &&
- !mptcp_skb_ext_exist(skb) &&
+ (!n || mptcp_skb_can_collapse(n, skb)) &&
(tcp_win_from_space(sk, skb->truesize) > skb->len ||
before(TCP_SKB_CB(skb)->seq, start))) {
end_of_skbs = false;
@@ -4976,6 +4976,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,
else
__skb_queue_tail(&tmp, nskb); /* defer rbtree insertion */
skb_set_owner_r(nskb, sk);
+ mptcp_skb_ext_move(nskb, skb);
/* Copy data, releasing collapsed skbs. */
while (copy > 0) {
@@ -4995,7 +4996,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,
skb = tcp_collapse_one(sk, skb, list, root);
if (!skb ||
skb == tail ||
- mptcp_skb_ext_exist(skb) ||
+ !mptcp_skb_can_collapse(nskb, skb) ||
(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)))
goto end;
#ifdef CONFIG_TLS_DEVICE
--
2.21.0
9 months
[PATCH net-next v3 00/11] Multipath TCP: Prerequisites
by Mat Martineau
v2 -> v3: Ensure sk_type alignment in struct sock (patch 2)
v1 -> v2: sk_pacing_shift left as a regular struct member (patch 2), and
modified SACK space check based on recent -net fix (patch 9).
The MPTCP upstreaming community has been collaborating on an
upstreamable MPTCP implementation that complies with RFC 8684. A minimal
set of features to comply with the specification involves a sizeable set
of code changes, so David requested that we split this work in to
multiple, smaller patch sets to build up MPTCP infrastructure.
The minimal MPTCP feature set we are proposing for review in the v5.6
timeframe begins with these three parts:
Part 1 (this patch set): MPTCP prerequisites. Introduce some MPTCP
definitions, additional ULP and skb extension features, TCP option space
checking, and a few exported symbols.
Part 2: Single subflow implementation and self tests.
Part 3: Switch from MPTCP v0 (RFC 6824) to MPTCP v1 (new RFC 8684,
publication expected in the next few days).
We plan to send those over the next week. Additional patches for
multiple subflow support, path management, active backup, and other
features are in the pipeline for submission after making progress with
the above reviews.
Clone/fetch:
https://github.com/multipath-tcp/mptcp_net-next.git (tag: netdev-v3-part1)
Browse:
https://github.com/multipath-tcp/mptcp_net-next/tree/netdev-v3-part1
Thank you for your review. You can find us at mptcp(a)lists.01.org and
https://is.gd/mptcp_upstream
Mat Martineau (9):
net: Make sock protocol value checks more specific
sock: Make sk_protocol a 16-bit value
tcp: Define IPPROTO_MPTCP
tcp: Add MPTCP option number
tcp, ulp: Add clone operation to tcp_ulp_ops
mptcp: Add MPTCP to skb extensions
tcp: Prevent coalesce/collapse when skb has MPTCP extensions
tcp: Export TCP functions and ops struct
tcp: Check for filled TCP option space before SACK
Paolo Abeni (2):
tcp: clean ext on tx recycle
skb: add helpers to allocate ext independently from sk_buff
MAINTAINERS | 10 ++++++++
include/linux/skbuff.h | 6 +++++
include/net/mptcp.h | 43 +++++++++++++++++++++++++++++++++
include/net/sock.h | 12 ++++-----
include/net/tcp.h | 22 +++++++++++++++++
include/trace/events/sock.h | 5 ++--
include/uapi/linux/in.h | 2 ++
net/ax25/af_ax25.c | 2 +-
net/core/skbuff.c | 42 ++++++++++++++++++++++++++++++--
net/decnet/af_decnet.c | 2 +-
net/ipv4/inet_connection_sock.c | 2 ++
net/ipv4/tcp.c | 6 ++---
net/ipv4/tcp_input.c | 10 ++++++--
net/ipv4/tcp_ipv4.c | 2 +-
net/ipv4/tcp_output.c | 12 ++++++---
net/ipv4/tcp_ulp.c | 12 +++++++++
net/ipv6/tcp_ipv6.c | 6 ++---
tools/include/uapi/linux/in.h | 2 ++
18 files changed, 173 insertions(+), 25 deletions(-)
create mode 100644 include/net/mptcp.h
--
2.24.1
9 months
[PATCH] Squash-to: "mptcp: Add MPTCP socket stubs"
by Paolo Abeni
whoops, bad bitmask in previous commit - we must enumerate
the supported {recv,send}msg flags.
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/protocol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index cbd6c1e0fb96..5e24e7cf7d70 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -22,7 +22,7 @@ static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
struct mptcp_sock *msk = mptcp_sk(sk);
struct socket *subflow = msk->subflow;
- if (msg->msg_flags & ~(MSG_MORE | MSG_NOSIGNAL))
+ if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL))
return -EOPNOTSUPP;
return sock_sendmsg(subflow, msg);
@@ -34,7 +34,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
struct mptcp_sock *msk = mptcp_sk(sk);
struct socket *subflow = msk->subflow;
- if (msg->msg_flags & ~(MSG_MORE | MSG_PEEK))
+ if (msg->msg_flags & ~(MSG_WAITALL | MSG_DONTWAIT))
return -EOPNOTSUPP;
return sock_recvmsg(subflow, msg, flags);
--
2.21.0
9 months
[PATCH 1/2] Squash-to: "mptcp: Add MPTCP socket stubs"
by Paolo Abeni
we will really support MSG_DONTWAIT in sendmsg()
and better set similar constraint on recvmsg() instead of
comments in later patch
---
net/mptcp/protocol.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 2e0a3266725a..cbd6c1e0fb96 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -22,7 +22,7 @@ static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
struct mptcp_sock *msk = mptcp_sk(sk);
struct socket *subflow = msk->subflow;
- if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL))
+ if (msg->msg_flags & ~(MSG_MORE | MSG_NOSIGNAL))
return -EOPNOTSUPP;
return sock_sendmsg(subflow, msg);
@@ -34,6 +34,9 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
struct mptcp_sock *msk = mptcp_sk(sk);
struct socket *subflow = msk->subflow;
+ if (msg->msg_flags & ~(MSG_MORE | MSG_PEEK))
+ return -EOPNOTSUPP;
+
return sock_recvmsg(subflow, msg, flags);
}
--
2.21.0
9 months
[PATCH] Squash-to: "mptcp: recvmsg() can drain data from multiple subflows"
by Paolo Abeni
Fix reverse X-mas tree variable declaration.
I guess we don't want to mess that right now ;)
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/protocol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index c33639b38ff2..13f3a202662a 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -110,8 +110,8 @@ static bool mptcp_ext_cache_refill(struct mptcp_sock *msk)
static struct sock *mptcp_subflow_recv_lookup(const struct mptcp_sock *msk)
{
- struct sock *sk = (struct sock *)msk;
struct mptcp_subflow_context *subflow;
+ struct sock *sk = (struct sock *)msk;
sock_owned_by_me(sk);
--
2.21.0
9 months
[PATCH] Squash-to: "mptcp: Handle MP_CAPABLE options for outgoing connections"
by Paolo Abeni
mptcp_established_options() definition will be changed in a couple of patches,
let's introduce early it's final form
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
include/net/mptcp.h | 5 ++++-
net/ipv4/tcp_output.c | 9 ++++-----
net/mptcp/options.c | 3 ++-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index d7af03848f5a..588abcb76da3 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -55,7 +55,8 @@ bool mptcp_syn_options(struct sock *sk, unsigned int *size,
void mptcp_rcv_synsent(struct sock *sk);
bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
struct mptcp_out_options *opts);
-bool mptcp_established_options(struct sock *sk, unsigned int *size,
+bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
+ unsigned int *size, unsigned int remaining,
struct mptcp_out_options *opts);
void mptcp_write_options(__be32 *ptr, struct mptcp_out_options *opts);
@@ -104,7 +105,9 @@ static inline bool mptcp_synack_options(const struct request_sock *req,
}
static inline bool mptcp_established_options(struct sock *sk,
+ struct sk_buff *skb,
unsigned int *size,
+ unsigned int remaining,
struct mptcp_out_options *opts)
{
return false;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index a4bf1197f577..d123d67026d5 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -798,11 +798,10 @@ static unsigned int tcp_established_options(struct sock *sk, struct sk_buff *skb
unsigned int remaining = MAX_TCP_OPTION_SPACE - size;
unsigned int opt_size = 0;
- if (mptcp_established_options(sk, &opt_size, &opts->mptcp)) {
- if (remaining >= opt_size) {
- opts->options |= OPTION_MPTCP;
- size += opt_size;
- }
+ if (mptcp_established_options(sk, skb, &opt_size, remaining,
+ &opts->mptcp)) {
+ opts->options |= OPTION_MPTCP;
+ size += opt_size;
}
}
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 26203dfb6be6..89aef0d0beb1 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -196,7 +196,8 @@ void mptcp_rcv_synsent(struct sock *sk)
}
}
-bool mptcp_established_options(struct sock *sk, unsigned int *size,
+bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
+ unsigned int *size, unsigned int remaining,
struct mptcp_out_options *opts)
{
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
--
2.21.0
9 months
[PATCH] Squash-to: "mptcp: Add key generation and token tree"
by Paolo Abeni
include net/tcp.h instead of linux/tcp.h
We will switch to the latter header later in part 4, but
in between, and after "mptcp: new sysctl to control the activation per NS"
we get some sparse warning due to missing ipv6-related fuction declaration.
Alternativelly we add an include for "net/tcp.h" in ctrl.c in patch
"mptcp: new sysctl to control the activation per NS".
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/protocol.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 4cf9620d19ec..5f43fa0275c0 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -8,7 +8,7 @@
#define __MPTCP_PROTOCOL_H
#include <linux/random.h>
-#include <linux/tcp.h>
+#include <net/tcp.h>
#include <net/inet_connection_sock.h>
#define MPTCP_SUPPORTED_VERSION 0
--
2.21.0
9 months
[PATCH] Squash-to: "mptcp: Implement MPTCP receive path"
by Paolo Abeni
drop duplicate line indroduced by the 'Squash-to' commit.
Note: this will cause some conflict in v1 patches. Resolution
is trivial, howver the patches must be rebased on top of this
one.
---
net/mptcp/protocol.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 1ede654057ba..5b73a1ae0da9 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -559,8 +559,6 @@ void mptcp_finish_connect(struct sock *ssk)
subflow->map_subflow_seq = 1;
subflow->rel_write_seq = 1;
- subflow->rel_write_seq = 1;
-
/* the socket is not connected yet, no msk/subflow ops can access/race
* accessing the field below
*/
--
2.21.0
9 months
