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

Commit 0f627126 authored by Stefan Raspl's avatar Stefan Raspl Committed by David S. Miller
Browse files

net/smc: cleanup smc_llc.h and smc_clc.h headers 



Remove structures used internal only from headers.
And remove an extra function parameter.

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

net/smc/af_smc.c

+4 −4
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ int smc_netinfo_by_tcpsk(struct socket *clcsock, 
	return rc;

}



static int smc_clnt_conf_first_link(struct smc_sock *smc, union ib_gid *gid)

static int smc_clnt_conf_first_link(struct smc_sock *smc)

{

	struct smc_link_group *lgr = smc->conn.lgr;

	struct smc_link *link;
@@ -346,7 +346,8 @@ static int smc_clnt_conf_first_link(struct smc_sock *smc, union ib_gid *gid) 
	/* send CONFIRM LINK response over RoCE fabric */

	rc = smc_llc_send_confirm_link(link,

				       link->smcibdev->mac[link->ibport - 1],

				       gid, SMC_LLC_RESP);

				       &link->smcibdev->gid[link->ibport - 1],

				       SMC_LLC_RESP);

	if (rc < 0)

		return SMC_CLC_DECL_TCL;
@@ -498,8 +499,7 @@ static int smc_connect_rdma(struct smc_sock *smc) 


	if (local_contact == SMC_FIRST_CONTACT) {

		/* QP confirmation over RoCE fabric */

		reason_code = smc_clnt_conf_first_link(

			smc, &smcibdev->gid[ibport - 1]);

		reason_code = smc_clnt_conf_first_link(smc);

		if (reason_code < 0) {

			rc = reason_code;

			goto out_err_unlock;

net/smc/smc_clc.c

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include "smc_clc.h"

#include "smc_ib.h"



/* eye catcher "SMCR" EBCDIC for CLC messages */

static const char SMC_EYECATCHER[4] = {'\xe2', '\xd4', '\xc3', '\xd9'};



/* check if received message has a correct header length and contains valid

 * heading and trailing eyecatchers

 */

net/smc/smc_clc.h

+0 −6
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
#define SMC_CLC_CONFIRM		0x03

#define SMC_CLC_DECLINE		0x04



/* eye catcher "SMCR" EBCDIC for CLC messages */

static const char SMC_EYECATCHER[4] = {'\xe2', '\xd4', '\xc3', '\xd9'};



#define SMC_CLC_V1		0x1		/* SMC version                */

#define CLC_WAIT_TIME		(6 * HZ)	/* max. wait time on clcsock  */

#define SMC_CLC_DECL_MEM	0x01010000  /* insufficient memory resources  */
@@ -124,9 +121,6 @@ smc_clc_proposal_get_prefix(struct smc_clc_msg_proposal *pclc) 
	       ((u8 *)pclc + sizeof(*pclc) + ntohs(pclc->iparea_offset));

}



struct smc_sock;

struct smc_ib_device;



int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,

		     u8 expected_type);

int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info);

net/smc/smc_llc.c

+30 −0
Original line number Diff line number Diff line
@@ -21,6 +21,36 @@ 
#include "smc_clc.h"

#include "smc_llc.h"



#define SMC_LLC_DATA_LEN		40



struct smc_llc_hdr {

	struct smc_wr_rx_hdr common;

	u8 length;	/* 44 */

	u8 reserved;

	u8 flags;

};



struct smc_llc_msg_confirm_link {	/* type 0x01 */

	struct smc_llc_hdr hd;

	u8 sender_mac[ETH_ALEN];

	u8 sender_gid[SMC_GID_SIZE];

	u8 sender_qp_num[3];

	u8 link_num;

	u8 link_uid[SMC_LGR_ID_SIZE];

	u8 max_links;

	u8 reserved[9];

};



union smc_llc_msg {

	struct smc_llc_msg_confirm_link confirm_link;

	struct {

		struct smc_llc_hdr hdr;

		u8 data[SMC_LLC_DATA_LEN];

	} raw;

};



#define SMC_LLC_FLAG_RESP		0x80



/********************************** send *************************************/



struct smc_llc_tx_pend {

net/smc/smc_llc.h

+0 −28
Original line number Diff line number Diff line
@@ -28,34 +28,6 @@ enum smc_llc_msg_type { 
	SMC_LLC_CONFIRM_LINK		= 0x01,

};



#define SMC_LLC_DATA_LEN		40



struct smc_llc_hdr {

	struct smc_wr_rx_hdr common;

	u8 length;	/* 44 */

	u8 reserved;

	u8 flags;

};



struct smc_llc_msg_confirm_link {	/* type 0x01 */

	struct smc_llc_hdr hd;

	u8 sender_mac[ETH_ALEN];

	u8 sender_gid[SMC_GID_SIZE];

	u8 sender_qp_num[3];

	u8 link_num;

	u8 link_uid[SMC_LGR_ID_SIZE];

	u8 max_links;

	u8 reserved[9];

};



union smc_llc_msg {

	struct smc_llc_msg_confirm_link confirm_link;

	struct {

		struct smc_llc_hdr hdr;

		u8 data[SMC_LLC_DATA_LEN];

	} raw;

};



/* transmit */

int smc_llc_send_confirm_link(struct smc_link *lnk, u8 mac[], union ib_gid *gid,

			      enum smc_llc_reqresp reqresp);