patch refreshes

diff --git a/queue-5.10/mptcp-do-not-fallback-when-ooo-is-present.patch b/queue-5.10/mptcp-do-not-fallback-when-ooo-is-present.patch
index dc61bccbaaf9e250b61db376565489e6dbc5a0ef..1e573ce92c8e3464e469fc49e041499d0b404b10 100644 (file)
--- a/queue-5.10/mptcp-do-not-fallback-when-ooo-is-present.patch
+++ b/queue-5.10/mptcp-do-not-fallback-when-ooo-is-present.patch
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/net/mptcp/protocol.c
 +++ b/net/mptcp/protocol.c
-@@ -478,6 +478,15 @@ static void mptcp_check_data_fin(struct
+@@ -477,6 +477,15 @@ static void mptcp_check_data_fin(struct
  static void mptcp_dss_corruption(struct mptcp_sock *msk, struct sock *ssk)
  {
        if (READ_ONCE(msk->allow_infinite_fallback)) {

diff --git a/queue-5.10/mptcp-fix-race-condition-in-mptcp_schedule_work.patch b/queue-5.10/mptcp-fix-race-condition-in-mptcp_schedule_work.patch
index e63e27346434764b2bed4564aebedcd1a27c286e..c4f6872d9ac7ffe532f1f4428f2326426d8afa5a 100644 (file)
--- a/queue-5.10/mptcp-fix-race-condition-in-mptcp_schedule_work.patch
+++ b/queue-5.10/mptcp-fix-race-condition-in-mptcp_schedule_work.patch
@@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/net/mptcp/protocol.c
 +++ b/net/mptcp/protocol.c
-@@ -717,14 +717,19 @@ static void mptcp_reset_timer(struct soc
+@@ -716,14 +716,19 @@ static void mptcp_reset_timer(struct soc
  
  bool mptcp_schedule_work(struct sock *sk)
  {

diff --git a/queue-5.10/mptcp-introduce-mptcp_schedule_work.patch b/queue-5.10/mptcp-introduce-mptcp_schedule_work.patch
index eeb10a71de746bc923ce790ab6007b675aa87d14..94bdbf414653da65b4f00fc296a55910082b3b5a 100644 (file)
--- a/queue-5.10/mptcp-introduce-mptcp_schedule_work.patch
+++ b/queue-5.10/mptcp-introduce-mptcp_schedule_work.patch
@@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/net/mptcp/protocol.c
 +++ b/net/mptcp/protocol.c
-@@ -642,9 +642,8 @@ static bool move_skbs_to_msk(struct mptc
+@@ -641,9 +641,8 @@ static bool move_skbs_to_msk(struct mptc
                 * this is not a good place to change state. Let the workqueue
                 * do it.
                 */
@@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        }
  
        spin_unlock_bh(&sk->sk_lock.slock);
-@@ -716,23 +715,32 @@ static void mptcp_reset_timer(struct soc
+@@ -715,23 +714,32 @@ static void mptcp_reset_timer(struct soc
        sk_reset_timer(sk, &icsk->icsk_retransmit_timer, jiffies + tout);
  }
  
@@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static void mptcp_check_for_eof(struct mptcp_sock *msk)
-@@ -1644,8 +1652,7 @@ static void mptcp_retransmit_handler(str
+@@ -1643,8 +1651,7 @@ static void mptcp_retransmit_handler(str
                mptcp_stop_timer(sk);
        } else {
                set_bit(MPTCP_WORK_RTX, &msk->flags);
@@ -101,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        }
  }
  
-@@ -2504,7 +2511,8 @@ static void mptcp_release_cb(struct sock
+@@ -2503,7 +2510,8 @@ static void mptcp_release_cb(struct sock
                struct sock *ssk;
  
                ssk = mptcp_subflow_recv_lookup(msk);

diff --git a/queue-5.15/mptcp-do-not-fallback-when-ooo-is-present.patch b/queue-5.15/mptcp-do-not-fallback-when-ooo-is-present.patch
index 5241c534af82b51045650d1b5e0930548afaa4a8..6471c12e1c46f6724176638afe62c332ff18f106 100644 (file)
--- a/queue-5.15/mptcp-do-not-fallback-when-ooo-is-present.patch
+++ b/queue-5.15/mptcp-do-not-fallback-when-ooo-is-present.patch
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/net/mptcp/protocol.c
 +++ b/net/mptcp/protocol.c
-@@ -574,6 +574,15 @@ static bool mptcp_check_data_fin(struct
+@@ -573,6 +573,15 @@ static bool mptcp_check_data_fin(struct
  static void mptcp_dss_corruption(struct mptcp_sock *msk, struct sock *ssk)
  {
        if (READ_ONCE(msk->allow_infinite_fallback)) {

diff --git a/queue-5.15/mptcp-fix-premature-close-in-case-of-fallback.patch b/queue-5.15/mptcp-fix-premature-close-in-case-of-fallback.patch
index 29d76b40484a3f83c36d553d86c23b7dd3a94b42..2f25d1459715b670b9cd2c84e949c7005b368b69 100644 (file)
--- a/queue-5.15/mptcp-fix-premature-close-in-case-of-fallback.patch
+++ b/queue-5.15/mptcp-fix-premature-close-in-case-of-fallback.patch
@@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/net/mptcp/protocol.c
 +++ b/net/mptcp/protocol.c
-@@ -2412,7 +2412,8 @@ static void __mptcp_close_subflow(struct
+@@ -2411,7 +2411,8 @@ static void __mptcp_close_subflow(struct
  
                if (ssk_state != TCP_CLOSE &&
                    (ssk_state != TCP_CLOSE_WAIT ||