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

Commit 51957bc5 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

net/smc: parameter cleanup in smc_cdc_get_free_slot() 



Use the smc_connection as first parameter with smc_cdc_get_free_slot().
This is just a small code cleanup, no functional change.

Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6cd4b58

net/smc/smc_cdc.c

+4 −3
Original line number Diff line number Diff line
@@ -62,10 +62,12 @@ static void smc_cdc_tx_handler(struct smc_wr_tx_pend_priv *pnd_snd, 
	bh_unlock_sock(&smc->sk);

}



int smc_cdc_get_free_slot(struct smc_link *link,

int smc_cdc_get_free_slot(struct smc_connection *conn,

			  struct smc_wr_buf **wr_buf,

			  struct smc_cdc_tx_pend **pend)

{

	struct smc_link *link = &conn->lgr->lnk[SMC_SINGLE_LINK];



	return smc_wr_tx_get_free_slot(link, smc_cdc_tx_handler, wr_buf,

				       (struct smc_wr_tx_pend_priv **)pend);

}
@@ -118,8 +120,7 @@ int smc_cdc_get_slot_and_msg_send(struct smc_connection *conn) 
	struct smc_wr_buf *wr_buf;

	int rc;



	rc = smc_cdc_get_free_slot(&conn->lgr->lnk[SMC_SINGLE_LINK], &wr_buf,

				   &pend);

	rc = smc_cdc_get_free_slot(conn, &wr_buf, &pend);

	if (rc)

		return rc;

net/smc/smc_cdc.h

+2 −1
Original line number Diff line number Diff line
@@ -206,7 +206,8 @@ static inline void smc_cdc_msg_to_host(struct smc_host_cdc_msg *local, 


struct smc_cdc_tx_pend;



int smc_cdc_get_free_slot(struct smc_link *link, struct smc_wr_buf **wr_buf,

int smc_cdc_get_free_slot(struct smc_connection *conn,

			  struct smc_wr_buf **wr_buf,

			  struct smc_cdc_tx_pend **pend);

void smc_cdc_tx_dismiss_slots(struct smc_connection *conn);

int smc_cdc_msg_send(struct smc_connection *conn, struct smc_wr_buf *wr_buf,

net/smc/smc_tx.c

+2 −4
Original line number Diff line number Diff line
@@ -394,8 +394,7 @@ int smc_tx_sndbuf_nonempty(struct smc_connection *conn) 
	int rc;



	spin_lock_bh(&conn->send_lock);

	rc = smc_cdc_get_free_slot(&conn->lgr->lnk[SMC_SINGLE_LINK], &wr_buf,

				   &pend);

	rc = smc_cdc_get_free_slot(conn, &wr_buf, &pend);

	if (rc < 0) {

		if (rc == -EBUSY) {

			struct smc_sock *smc =
@@ -463,8 +462,7 @@ void smc_tx_consumer_update(struct smc_connection *conn) 
	    ((to_confirm > conn->rmbe_update_limit) &&

	     ((to_confirm > (conn->rmbe_size / 2)) ||

	      conn->local_rx_ctrl.prod_flags.write_blocked))) {

		rc = smc_cdc_get_free_slot(&conn->lgr->lnk[SMC_SINGLE_LINK],

					   &wr_buf, &pend);

		rc = smc_cdc_get_free_slot(conn, &wr_buf, &pend);

		if (!rc)

			rc = smc_cdc_msg_send(conn, wr_buf, pend);

		if (rc < 0) {