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

Merge branch 'smc-fixes' 



Ursula Braun says:

====================
net/smc: fix typo and clc-bug

I received 2 bug reports for my new AF_SMC-code. Here are the fixes for them.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 038c35a8 143c0171

net/core/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static const char *const af_family_clock_key_strings[AF_MAX+1] = { 
  "clock-AF_RXRPC" , "clock-AF_ISDN"     , "clock-AF_PHONET"   ,

  "clock-AF_IEEE802154", "clock-AF_CAIF" , "clock-AF_ALG"      ,

  "clock-AF_NFC"   , "clock-AF_VSOCK"    , "clock-AF_KCM"      ,

  "clock-AF_QIPCRTR", "closck-AF_smc"    , "clock-AF_MAX"

  "clock-AF_QIPCRTR", "clock-AF_SMC"     , "clock-AF_MAX"

};



/*

net/smc/smc_clc.c

+4 −6
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include <linux/in.h>

#include <linux/if_ether.h>

#include <net/sock.h>

#include <net/tcp.h>
@@ -151,8 +152,7 @@ int smc_clc_send_proposal(struct smc_sock *smc, 
	pclc.hdr.version = SMC_CLC_V1;		/* SMC version */

	memcpy(pclc.lcl.id_for_peer, local_systemid, sizeof(local_systemid));

	memcpy(&pclc.lcl.gid, &smcibdev->gid[ibport - 1], SMC_GID_SIZE);

	memcpy(&pclc.lcl.mac, &smcibdev->mac[ibport - 1],

	       sizeof(smcibdev->mac[ibport - 1]));

	memcpy(&pclc.lcl.mac, &smcibdev->mac[ibport - 1], ETH_ALEN);



	/* determine subnet and mask from internal TCP socket */

	rc = smc_netinfo_by_tcpsk(smc->clcsock, &pclc.outgoing_subnet,
@@ -199,8 +199,7 @@ int smc_clc_send_confirm(struct smc_sock *smc) 
	memcpy(cclc.lcl.id_for_peer, local_systemid, sizeof(local_systemid));

	memcpy(&cclc.lcl.gid, &link->smcibdev->gid[link->ibport - 1],

	       SMC_GID_SIZE);

	memcpy(&cclc.lcl.mac, &link->smcibdev->mac[link->ibport - 1],

	       sizeof(link->smcibdev->mac));

	memcpy(&cclc.lcl.mac, &link->smcibdev->mac[link->ibport - 1], ETH_ALEN);

	hton24(cclc.qpn, link->roce_qp->qp_num);

	cclc.rmb_rkey =

		htonl(conn->rmb_desc->mr_rx[SMC_SINGLE_LINK]->rkey);
@@ -252,8 +251,7 @@ int smc_clc_send_accept(struct smc_sock *new_smc, int srv_first_contact) 
	memcpy(aclc.lcl.id_for_peer, local_systemid, sizeof(local_systemid));

	memcpy(&aclc.lcl.gid, &link->smcibdev->gid[link->ibport - 1],

	       SMC_GID_SIZE);

	memcpy(&aclc.lcl.mac, link->smcibdev->mac[link->ibport - 1],

	       sizeof(link->smcibdev->mac[link->ibport - 1]));

	memcpy(&aclc.lcl.mac, link->smcibdev->mac[link->ibport - 1], ETH_ALEN);

	hton24(aclc.qpn, link->roce_qp->qp_num);

	aclc.rmb_rkey =

		htonl(conn->rmb_desc->mr_rx[SMC_SINGLE_LINK]->rkey);

net/smc/smc_ib.h

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef _SMC_IB_H

#define _SMC_IB_H



#include <linux/if_ether.h>

#include <rdma/ib_verbs.h>



#define SMC_MAX_PORTS			2	/* Max # of ports */
@@ -34,7 +35,8 @@ struct smc_ib_device { /* ib-device infos for smc */ 
	struct ib_cq		*roce_cq_recv;	/* recv completion queue */

	struct tasklet_struct	send_tasklet;	/* called by send cq handler */

	struct tasklet_struct	recv_tasklet;	/* called by recv cq handler */

	char			mac[SMC_MAX_PORTS][6]; /* mac address per port*/

	char			mac[SMC_MAX_PORTS][ETH_ALEN];

						/* mac address per port*/

	union ib_gid		gid[SMC_MAX_PORTS]; /* gid per port */

	u8			initialized : 1; /* ib dev CQ, evthdl done */

	struct work_struct	port_event_work;