mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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: b8649efad8
("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>
This commit is contained in:
parent
225d946426
commit
ccc8ca9b90
|
@ -101,9 +101,7 @@ int smc_cdc_msg_send(struct smc_connection *conn,
|
|||
|
||||
conn->tx_cdc_seq++;
|
||||
conn->local_tx_ctrl.seqno = conn->tx_cdc_seq;
|
||||
smc_host_msg_to_cdc((struct smc_cdc_msg *)wr_buf,
|
||||
&conn->local_tx_ctrl, conn);
|
||||
smc_curs_copy(&cfed, &((struct smc_host_cdc_msg *)wr_buf)->cons, conn);
|
||||
smc_host_msg_to_cdc((struct smc_cdc_msg *)wr_buf, conn, &cfed);
|
||||
rc = smc_wr_tx_send(link, (struct smc_wr_tx_pend_priv *)pend);
|
||||
if (!rc)
|
||||
smc_curs_copy(&conn->rx_curs_confirmed, &cfed, conn);
|
||||
|
|
|
@ -211,26 +211,27 @@ static inline int smc_curs_diff_large(unsigned int size,
|
|||
|
||||
static inline void smc_host_cursor_to_cdc(union smc_cdc_cursor *peer,
|
||||
union smc_host_cursor *local,
|
||||
union smc_host_cursor *save,
|
||||
struct smc_connection *conn)
|
||||
{
|
||||
union smc_host_cursor temp;
|
||||
|
||||
smc_curs_copy(&temp, local, conn);
|
||||
peer->count = htonl(temp.count);
|
||||
peer->wrap = htons(temp.wrap);
|
||||
smc_curs_copy(save, local, conn);
|
||||
peer->count = htonl(save->count);
|
||||
peer->wrap = htons(save->wrap);
|
||||
/* peer->reserved = htons(0); must be ensured by caller */
|
||||
}
|
||||
|
||||
static inline void smc_host_msg_to_cdc(struct smc_cdc_msg *peer,
|
||||
struct smc_host_cdc_msg *local,
|
||||
struct smc_connection *conn)
|
||||
struct smc_connection *conn,
|
||||
union smc_host_cursor *save)
|
||||
{
|
||||
struct smc_host_cdc_msg *local = &conn->local_tx_ctrl;
|
||||
|
||||
peer->common.type = local->common.type;
|
||||
peer->len = local->len;
|
||||
peer->seqno = htons(local->seqno);
|
||||
peer->token = htonl(local->token);
|
||||
smc_host_cursor_to_cdc(&peer->prod, &local->prod, conn);
|
||||
smc_host_cursor_to_cdc(&peer->cons, &local->cons, conn);
|
||||
smc_host_cursor_to_cdc(&peer->prod, &local->prod, save, conn);
|
||||
smc_host_cursor_to_cdc(&peer->cons, &local->cons, save, conn);
|
||||
peer->prod_flags = local->prod_flags;
|
||||
peer->conn_state_flags = local->conn_state_flags;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue