summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorUrsula Braun <ubraun@linux.ibm.com>2020-09-03 21:53:16 +0200
committerDavid S. Miller <davem@davemloft.net>2020-09-04 01:52:33 +0200
commit2d2bfeb8c5c8c95a93c473ca2c7d07cad6943a34 (patch)
tree73704a752703f35af142d29ceb8ee4d499216860 /net
parentnet/smc: fix toleration of fake add_link messages (diff)
downloadlinux-2d2bfeb8c5c8c95a93c473ca2c7d07cad6943a34.tar.xz
linux-2d2bfeb8c5c8c95a93c473ca2c7d07cad6943a34.zip
net/smc: set rx_off for SMCR explicitly
SMC tries to make use of SMCD first. If a problem shows up, it tries to switch to SMCR. If the SMCD initializing problem shows up after the SMCD connection has already been initialized, field rx_off keeps the wrong SMCD value for SMCR, which results in corrupted data at the receiver. This patch adds an explicit (re-)setting of field rx_off to zero if the connection uses SMCR. Fixes: be244f28d22f ("net/smc: add SMC-D support in data transfer") Reviewed-by: Karsten Graul <kgraul@linux.ibm.com> Signed-off-by: Ursula Braun <ubraun@linux.ibm.com> Signed-off-by: Karsten Graul <kgraul@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/smc/smc_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index b42fa3b00d00..a6ac0eb20c99 100644
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -1356,6 +1356,8 @@ create:
if (ini->is_smcd) {
conn->rx_off = sizeof(struct smcd_cdc_msg);
smcd_cdc_rx_init(conn); /* init tasklet for this conn */
+ } else {
+ conn->rx_off = 0;
}
#ifndef KERNEL_HAS_ATOMIC64
spin_lock_init(&conn->acurs_lock);