Commit 40c46635 authored by Varun Prakash's avatar Varun Prakash Committed by Nicholas Bellinger
Browse files

cxgb4, iw_cxgb4, cxgb4i: remove duplicate definitions 



move struct ulptx_idata definition to
common header file t4_msg.h.

Signed-off-by: default avatarVarun Prakash <varun@chelsio.com>
Acked-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent a84f0e13

drivers/infiniband/hw/cxgb4/t4fw_ri_api.h

+0 −9
Original line number Diff line number Diff line
@@ -753,15 +753,6 @@ struct fw_ri_wr { 
#define FW_RI_WR_P2PTYPE_G(x)	\

	(((x) >> FW_RI_WR_P2PTYPE_S) & FW_RI_WR_P2PTYPE_M)



struct ulptx_idata {

	__be32 cmd_more;

	__be32 len;

};



#define ULPTX_NSGE_S    0

#define ULPTX_NSGE_M    0xFFFF

#define ULPTX_NSGE_V(x) ((x) << ULPTX_NSGE_S)



#define RX_DACK_MODE_S    29

#define RX_DACK_MODE_M    0x3

#define RX_DACK_MODE_V(x) ((x) << RX_DACK_MODE_S)

drivers/net/ethernet/chelsio/cxgb4/t4_msg.h

+5 −0
Original line number Diff line number Diff line
@@ -1222,6 +1222,11 @@ struct ulptx_sgl { 
	struct ulptx_sge_pair sge[0];

};



struct ulptx_idata {

	__be32 cmd_more;

	__be32 len;

};



#define ULPTX_NSGE_S    0

#define ULPTX_NSGE_V(x) ((x) << ULPTX_NSGE_S)

drivers/scsi/cxgbi/cxgb4i/cxgb4i.h

+0 −5
Original line number Diff line number Diff line
@@ -25,11 +25,6 @@ 


#define T5_ISS_VALID		(1 << 18)



struct ulptx_idata {

	__be32 cmd_more;

	__be32 len;

};



struct cpl_rx_data_ddp {

	union opcode_tid ot;

	__be16 urg;