| Message ID | 7d8d66c1daa70ab3b70200ca33e5551427fadbab.1576866221.git.pabeni@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | Squash-to: "tcp: coalesce/collapse must respect MPTCP extensions" | expand |
On Fri, 20 Dec 2019, Paolo Abeni wrote: > clarify mptcp ext usage > > to be added to squashed commit changelog: > """ > v5 -> v6: > - clarify MPTCP must always be cleared at allocation time "clarify MPTCP skb extensions must always be cleared at allocation time" > """ > --- > include/net/mptcp.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/net/mptcp.h b/include/net/mptcp.h > index 7d693d0a38ff..8825da7538dd 100644 > --- a/include/net/mptcp.h > +++ b/include/net/mptcp.h > @@ -48,6 +48,9 @@ static inline void mptcp_skb_ext_move(struct sk_buff *to, > static inline bool mptcp_ext_matches(const struct mptcp_ext *to_ext, > const struct mptcp_ext *from_ext) > { > + /* MPTCP always clear the ext when adding it to the skb, so s/clear/clears/ > + * holes do not bother us here > + */ > return !from_ext || > (to_ext && from_ext && > !memcmp(from_ext, to_ext, sizeof(struct mptcp_ext))); > -- > 2.21.0 -- Mat Martineau Intel
Hi Paolo, Mat, On 20/12/2019 19:29, Mat Martineau wrote: > > On Fri, 20 Dec 2019, Paolo Abeni wrote: > >> clarify mptcp ext usage >> >> to be added to squashed commit changelog: >> """ >> v5 -> v6: >> - clarify MPTCP must always be cleared at allocation time > > "clarify MPTCP skb extensions must always be cleared at allocation time" > >> """ >> --- >> include/net/mptcp.h | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/include/net/mptcp.h b/include/net/mptcp.h >> index 7d693d0a38ff..8825da7538dd 100644 >> --- a/include/net/mptcp.h >> +++ b/include/net/mptcp.h >> @@ -48,6 +48,9 @@ static inline void mptcp_skb_ext_move(struct sk_buff >> *to, >> static inline bool mptcp_ext_matches(const struct mptcp_ext *to_ext, >> const struct mptcp_ext *from_ext) >> { >> + /* MPTCP always clear the ext when adding it to the skb, so > > s/clear/clears/ Thank you for the patch, the review and the improvement! - 8b2a7b366d45: "squashed" in "tcp: coalesce/collapse must respect MPTCP extensions" - [t/tcp-Prevent-coalesce-collapse-when-skb-has-MPTCP-extensions b443e354be32] mptcp: fix typo in comment - bcfc31d5bde4..418ff4851eb5: result Tests + export in progress! Cheers, Matt
diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 7d693d0a38ff..8825da7538dd 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -48,6 +48,9 @@ static inline void mptcp_skb_ext_move(struct sk_buff *to, static inline bool mptcp_ext_matches(const struct mptcp_ext *to_ext, const struct mptcp_ext *from_ext) { + /* MPTCP always clear the ext when adding it to the skb, so + * holes do not bother us here + */ return !from_ext || (to_ext && from_ext && !memcmp(from_ext, to_ext, sizeof(struct mptcp_ext)));