Re: [PATCH net-next 1/1] net/smc: parameter cleanup in smc_cdc_get_free_slot()

2017-09-21 Thread David Miller 
From: Ursula Braun 
Date: Thu, 21 Sep 2017 09:17:34 +0200

> 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: Ursula Braun 

Applied.

[PATCH net-next 1/1] net/smc: parameter cleanup in smc_cdc_get_free_slot()

2017-09-21 Thread Ursula Braun 
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: Ursula Braun 
---
 net/smc/smc_cdc.c | 7 ---
 net/smc/smc_cdc.h | 3 ++-
 net/smc/smc_tx.c  | 6 ++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net/smc/smc_cdc.c b/net/smc/smc_cdc.c
index a7294edbc221..5ef97e5a5f78 100644
--- a/net/smc/smc_cdc.c
+++ b/net/smc/smc_cdc.c
@@ -62,10 +62,12 @@ static void smc_cdc_tx_handler(struct smc_wr_tx_pend_priv 
*pnd_snd,
bh_unlock_sock(>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 = >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(>lgr->lnk[SMC_SINGLE_LINK], _buf,
-  );
+   rc = smc_cdc_get_free_slot(conn, _buf, );
if (rc)
return rc;
 
diff --git a/net/smc/smc_cdc.h b/net/smc/smc_cdc.h
index 8e1d76f26007..56f883d1159c 100644
--- a/net/smc/smc_cdc.h
+++ b/net/smc/smc_cdc.h
@@ -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,
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c
index 3c656beb8820..e2228f6d1c25 100644
--- a/net/smc/smc_tx.c
+++ b/net/smc/smc_tx.c
@@ -394,8 +394,7 @@ int smc_tx_sndbuf_nonempty(struct smc_connection *conn)
int rc;
 
spin_lock_bh(>send_lock);
-   rc = smc_cdc_get_free_slot(>lgr->lnk[SMC_SINGLE_LINK], _buf,
-  );
+   rc = smc_cdc_get_free_slot(conn, _buf, );
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(>lgr->lnk[SMC_SINGLE_LINK],
-  _buf, );
+   rc = smc_cdc_get_free_slot(conn, _buf, );
if (!rc)
rc = smc_cdc_msg_send(conn, wr_buf, pend);
if (rc < 0) {
-- 
2.13.5