Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/smc: fix byte_order for rx_curs_confirmed

The recent change in the rx_curs_confirmed assignment disregards
byte order, which causes problems on little endian architectures.
This patch fixes it.

Fixes: b8649efad879 ("net/smc: fix sender_free computation") (net-tree)
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Ursula Braun and committed by
David S. Miller
ccc8ca9b 225d9464

+11 -12
+1 -3
net/smc/smc_cdc.c
··· 101 101 102 102 conn->tx_cdc_seq++; 103 103 conn->local_tx_ctrl.seqno = conn->tx_cdc_seq; 104 - smc_host_msg_to_cdc((struct smc_cdc_msg *)wr_buf, 105 - &conn->local_tx_ctrl, conn); 106 - smc_curs_copy(&cfed, &((struct smc_host_cdc_msg *)wr_buf)->cons, conn); 104 + smc_host_msg_to_cdc((struct smc_cdc_msg *)wr_buf, conn, &cfed); 107 105 rc = smc_wr_tx_send(link, (struct smc_wr_tx_pend_priv *)pend); 108 106 if (!rc) 109 107 smc_curs_copy(&conn->rx_curs_confirmed, &cfed, conn);
+10 -9
net/smc/smc_cdc.h
··· 211 211 212 212 static inline void smc_host_cursor_to_cdc(union smc_cdc_cursor *peer, 213 213 union smc_host_cursor *local, 214 + union smc_host_cursor *save, 214 215 struct smc_connection *conn) 215 216 { 216 - union smc_host_cursor temp; 217 - 218 - smc_curs_copy(&temp, local, conn); 219 - peer->count = htonl(temp.count); 220 - peer->wrap = htons(temp.wrap); 217 + smc_curs_copy(save, local, conn); 218 + peer->count = htonl(save->count); 219 + peer->wrap = htons(save->wrap); 221 220 /* peer->reserved = htons(0); must be ensured by caller */ 222 221 } 223 222 224 223 static inline void smc_host_msg_to_cdc(struct smc_cdc_msg *peer, 225 - struct smc_host_cdc_msg *local, 226 - struct smc_connection *conn) 224 + struct smc_connection *conn, 225 + union smc_host_cursor *save) 227 226 { 227 + struct smc_host_cdc_msg *local = &conn->local_tx_ctrl; 228 + 228 229 peer->common.type = local->common.type; 229 230 peer->len = local->len; 230 231 peer->seqno = htons(local->seqno); 231 232 peer->token = htonl(local->token); 232 - smc_host_cursor_to_cdc(&peer->prod, &local->prod, conn); 233 - smc_host_cursor_to_cdc(&peer->cons, &local->cons, conn); 233 + smc_host_cursor_to_cdc(&peer->prod, &local->prod, save, conn); 234 + smc_host_cursor_to_cdc(&peer->cons, &local->cons, save, conn); 234 235 peer->prod_flags = local->prod_flags; 235 236 peer->conn_state_flags = local->conn_state_flags; 236 237 }