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

Commit d4d602e9 authored by Don Hiatt's avatar Don Hiatt Committed by Doug Ledford
Browse files

IB/hfi1: Rename hfi1_pio_header to hfi1_sdma_header. 



hfi1_pio_header should really be called hfi1_sdma_header
as it is only used for sdma transmits.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDon Hiatt <don.hiatt@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent a9b6b3bc

drivers/infiniband/hw/hfi1/ruc.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ u32 hfi1_make_grh(struct hfi1_ibport *ibp, struct ib_grh *hdr, 
	return sizeof(struct ib_grh) / sizeof(u32);

}



#define BTH2_OFFSET (offsetof(struct hfi1_pio_header, hdr.u.oth.bth[2]) / 4)

#define BTH2_OFFSET (offsetof(struct hfi1_sdma_header, hdr.u.oth.bth[2]) / 4)



/**

 * build_ahg - create ahg in s_ahg

drivers/infiniband/hw/hfi1/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static int build_verbs_tx_desc( 
	u64 pbc)

{

	int ret = 0;

	struct hfi1_pio_header *phdr = &tx->phdr;

	struct hfi1_sdma_header *phdr = &tx->phdr;

	u16 hdrbytes = tx->hdr_dwords << 2;



	if (!ahg_info->ahgcount) {

drivers/infiniband/hw/hfi1/verbs.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ struct hfi1_ahg_info { 
	u8 ahgidx;

};



struct hfi1_pio_header {

struct hfi1_sdma_header {

	__le64 pbc;

	struct hfi1_ib_header hdr;

} __packed;

drivers/infiniband/hw/hfi1/verbs_txreq.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#include "iowait.h"



struct verbs_txreq {

	struct hfi1_pio_header	phdr;

	struct hfi1_sdma_header	phdr;

	struct sdma_txreq       txreq;

	struct rvt_qp           *qp;

	struct rvt_swqe         *wqe;