Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7358799c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-smc-fixes' 



Ursula Braun says:

====================
net/smc: fixes 2018-02-28

here are 3 smc bug fixes for the net-tree. Karsten's first patch is
the reworked version of last week's
   "[PATCH net-next 2/5] net/smc: fix structure size"
patch, now solved without using __packed, and now targetted for net
instead of net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4e09ff53 a5dcb73b

net/smc/af_smc.c

+3 −1
Original line number Diff line number Diff line
@@ -1406,8 +1406,10 @@ static int smc_create(struct net *net, struct socket *sock, int protocol, 
	smc->use_fallback = false; /* assume rdma capability first */

	rc = sock_create_kern(net, PF_INET, SOCK_STREAM,

			      IPPROTO_TCP, &smc->clcsock);

	if (rc)

	if (rc) {

		sk_common_release(sk);

		goto out;

	}

	smc->sk.sk_sndbuf = max(smc->clcsock->sk->sk_sndbuf, SMC_BUF_MIN_SIZE);

	smc->sk.sk_rcvbuf = max(smc->clcsock->sk->sk_rcvbuf, SMC_BUF_MIN_SIZE);

net/smc/smc_cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static void smc_cdc_rx_handler(struct ib_wc *wc, void *buf) 


	if (wc->byte_len < offsetof(struct smc_cdc_msg, reserved))

		return; /* short message */

	if (cdc->len != sizeof(*cdc))

	if (cdc->len != SMC_WR_TX_SIZE)

		return; /* invalid message */

	smc_cdc_msg_recv(cdc, link, wc->wr_id);

}

net/smc/smc_core.c

+2 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static int smc_lgr_create(struct smc_sock *smc, __be32 peer_in_addr, 


	lnk = &lgr->lnk[SMC_SINGLE_LINK];

	/* initialize link */

	lnk->link_id = SMC_SINGLE_LINK;

	lnk->smcibdev = smcibdev;

	lnk->ibport = ibport;

	lnk->path_mtu = smcibdev->pattr[ibport - 1].active_mtu;
@@ -465,7 +466,7 @@ int smc_conn_create(struct smc_sock *smc, __be32 peer_in_addr, 
		rc = smc_link_determine_gid(conn->lgr);

	}

	conn->local_tx_ctrl.common.type = SMC_CDC_MSG_TYPE;

	conn->local_tx_ctrl.len = sizeof(struct smc_cdc_msg);

	conn->local_tx_ctrl.len = SMC_WR_TX_SIZE;

#ifndef KERNEL_HAS_ATOMIC64

	spin_lock_init(&conn->acurs_lock);

#endif

net/smc/smc_llc.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int smc_llc_send_confirm_link(struct smc_link *link, u8 mac[], 
	memcpy(confllc->sender_mac, mac, ETH_ALEN);

	memcpy(confllc->sender_gid, gid, SMC_GID_SIZE);

	hton24(confllc->sender_qp_num, link->roce_qp->qp_num);

	/* confllc->link_num = SMC_SINGLE_LINK; already done by memset above */

	confllc->link_num = link->link_id;

	memcpy(confllc->link_uid, lgr->id, SMC_LGR_ID_SIZE);

	confllc->max_links = SMC_LINKS_PER_LGR_MAX;

	/* send llc message */