From 3f5f5795e287359f00a173c2670abad8d5ed646c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 7 Dec 2019 12:21:07 +0100 Subject: [PATCH] drop iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch in 4.14, 4.9, and 4.4 --- ...connect-with-mpav1-if-the-peer-abort.patch | 39 ------------------- queue-4.14/series | 1 - ...connect-with-mpav1-if-the-peer-abort.patch | 39 ------------------- queue-4.4/series | 1 - ...connect-with-mpav1-if-the-peer-abort.patch | 39 ------------------- queue-4.9/series | 1 - 6 files changed, 120 deletions(-) delete mode 100644 queue-4.14/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch delete mode 100644 queue-4.4/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch delete mode 100644 queue-4.9/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch diff --git a/queue-4.14/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch b/queue-4.14/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch deleted file mode 100644 index e9edf134a5b..00000000000 --- a/queue-4.14/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f88ffd053ad629db259b45bdef0d3c61f2acd162 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 10 Nov 2018 05:27:39 -0800 -Subject: iw_cxgb4: only reconnect with MPAv1 if the peer aborts - -From: Steve Wise - -[ Upstream commit 9828ca654b52848e7eb7dcc9b0994ff130dd4546 ] - -Only retry connection setup with MPAv1 if the peer actually aborted the -connection upon receiving the MPAv2 start message. This avoids retrying -with MPAv1 in the case where the connection was aborted due to retransmit -timeouts. - -Fixes: d2fe99e86bb2 ("RDMA/cxgb4: Add support for MPAv2 Enhanced RDMA Negotiation") -Signed-off-by: Steve Wise -Signed-off-by: Jason Gunthorpe -Signed-off-by: Sasha Levin ---- - drivers/infiniband/hw/cxgb4/cm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c -index bb36cdf82a8d6..cdde7048891c0 100644 ---- a/drivers/infiniband/hw/cxgb4/cm.c -+++ b/drivers/infiniband/hw/cxgb4/cm.c -@@ -2774,7 +2774,8 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) - break; - case MPA_REQ_SENT: - (void)stop_ep_timer(ep); -- if (mpa_rev == 1 || (mpa_rev == 2 && ep->tried_with_mpa_v1)) -+ if (status != CPL_ERR_CONN_RESET || mpa_rev == 1 || -+ (mpa_rev == 2 && ep->tried_with_mpa_v1)) - connect_reply_upcall(ep, -ECONNRESET); - else { - /* --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 8fb58b7f826..8aadfd9b8bb 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -50,7 +50,6 @@ clk-rockchip-fix-id-of-8ch-clock-of-i2s1-for-rk3328.patch regulator-fix-return-value-of-_set_load-stub.patch net-next-hinic-fix-a-bug-in-set-mac-address.patch iomap-sub-block-dio-needs-to-zeroout-beyond-eof.patch -iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch mips-octeon-octeon-platform-fix-typing.patch net-smc-use-after-free-fix-in-smc_wr_tx_put_slot.patch math-emu-soft-fp.h-_fp_round_zero-cast-0-to-void-to-.patch diff --git a/queue-4.4/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch b/queue-4.4/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch deleted file mode 100644 index 3056fc5e4bd..00000000000 --- a/queue-4.4/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0259a468e2383fc41f8bf84b9a7548727874c03c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 10 Nov 2018 05:27:39 -0800 -Subject: iw_cxgb4: only reconnect with MPAv1 if the peer aborts - -From: Steve Wise - -[ Upstream commit 9828ca654b52848e7eb7dcc9b0994ff130dd4546 ] - -Only retry connection setup with MPAv1 if the peer actually aborted the -connection upon receiving the MPAv2 start message. This avoids retrying -with MPAv1 in the case where the connection was aborted due to retransmit -timeouts. - -Fixes: d2fe99e86bb2 ("RDMA/cxgb4: Add support for MPAv2 Enhanced RDMA Negotiation") -Signed-off-by: Steve Wise -Signed-off-by: Jason Gunthorpe -Signed-off-by: Sasha Levin ---- - drivers/infiniband/hw/cxgb4/cm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c -index 54fd4d81a3f1f..0d13d369fea91 100644 ---- a/drivers/infiniband/hw/cxgb4/cm.c -+++ b/drivers/infiniband/hw/cxgb4/cm.c -@@ -2691,7 +2691,8 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) - break; - case MPA_REQ_SENT: - (void)stop_ep_timer(ep); -- if (mpa_rev == 1 || (mpa_rev == 2 && ep->tried_with_mpa_v1)) -+ if (status != CPL_ERR_CONN_RESET || mpa_rev == 1 || -+ (mpa_rev == 2 && ep->tried_with_mpa_v1)) - connect_reply_upcall(ep, -ECONNRESET); - else { - /* --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 6df20ed9e9a..1c86921cec6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -22,7 +22,6 @@ scsi-zfcp-drop-default-switch-case-which-might-paper.patch pinctrl-qcom-ssbi-gpio-fix-gpio-hog-related-boot-iss.patch staging-iio-adt7316-fix-i2c-data-reading-set-the-dat.patch regulator-fix-return-value-of-_set_load-stub.patch -iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch mips-octeon-octeon-platform-fix-typing.patch math-emu-soft-fp.h-_fp_round_zero-cast-0-to-void-to-.patch rtc-max8997-fix-the-returned-value-in-case-of-error-.patch diff --git a/queue-4.9/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch b/queue-4.9/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch deleted file mode 100644 index 856a10360e9..00000000000 --- a/queue-4.9/iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b2b0c34036171c5e113ae18b89055f5fb628b19f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 10 Nov 2018 05:27:39 -0800 -Subject: iw_cxgb4: only reconnect with MPAv1 if the peer aborts - -From: Steve Wise - -[ Upstream commit 9828ca654b52848e7eb7dcc9b0994ff130dd4546 ] - -Only retry connection setup with MPAv1 if the peer actually aborted the -connection upon receiving the MPAv2 start message. This avoids retrying -with MPAv1 in the case where the connection was aborted due to retransmit -timeouts. - -Fixes: d2fe99e86bb2 ("RDMA/cxgb4: Add support for MPAv2 Enhanced RDMA Negotiation") -Signed-off-by: Steve Wise -Signed-off-by: Jason Gunthorpe -Signed-off-by: Sasha Levin ---- - drivers/infiniband/hw/cxgb4/cm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c -index 605d50ad123cc..49a21e6aaabcc 100644 ---- a/drivers/infiniband/hw/cxgb4/cm.c -+++ b/drivers/infiniband/hw/cxgb4/cm.c -@@ -2756,7 +2756,8 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) - break; - case MPA_REQ_SENT: - (void)stop_ep_timer(ep); -- if (mpa_rev == 1 || (mpa_rev == 2 && ep->tried_with_mpa_v1)) -+ if (status != CPL_ERR_CONN_RESET || mpa_rev == 1 || -+ (mpa_rev == 2 && ep->tried_with_mpa_v1)) - connect_reply_upcall(ep, -ECONNRESET); - else { - /* --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index ac6f1fdee3f..8f9d7be9c1f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -31,7 +31,6 @@ scsi-zfcp-drop-default-switch-case-which-might-paper.patch pinctrl-qcom-ssbi-gpio-fix-gpio-hog-related-boot-iss.patch staging-iio-adt7316-fix-i2c-data-reading-set-the-dat.patch regulator-fix-return-value-of-_set_load-stub.patch -iw_cxgb4-only-reconnect-with-mpav1-if-the-peer-abort.patch mips-octeon-octeon-platform-fix-typing.patch math-emu-soft-fp.h-_fp_round_zero-cast-0-to-void-to-.patch rtc-max8997-fix-the-returned-value-in-case-of-error-.patch -- 2.47.3