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

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

target/cxgbit: Use T6 specific macro to set the force bit 



For T6 adapters use T6 specific macro to set the force bit.

Signed-off-by: default avatarVarun Prakash <varun@chelsio.com>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 5cadafb2

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

+4 −0
Original line number Diff line number Diff line
@@ -1349,6 +1349,10 @@ struct cpl_tx_data { 
#define TX_FORCE_S	13

#define TX_FORCE_V(x)	((x) << TX_FORCE_S)



#define T6_TX_FORCE_S		20

#define T6_TX_FORCE_V(x)	((x) << T6_TX_FORCE_S)

#define T6_TX_FORCE_F		T6_TX_FORCE_V(1U)



enum {

	ULP_TX_MEM_READ = 2,

	ULP_TX_MEM_WRITE = 3,

drivers/target/iscsi/cxgbit/cxgbit_target.c

+3 −1
Original line number Diff line number Diff line
@@ -162,12 +162,14 @@ cxgbit_tx_data_wr(struct cxgbit_sock *csk, struct sk_buff *skb, u32 dlen, 
		  u32 len, u32 credits, u32 compl)

{

	struct fw_ofld_tx_data_wr *req;

	const struct cxgb4_lld_info *lldi = &csk->com.cdev->lldi;

	u32 submode = cxgbit_skcb_submode(skb);

	u32 wr_ulp_mode = 0;

	u32 hdr_size = sizeof(*req);

	u32 opcode = FW_OFLD_TX_DATA_WR;

	u32 immlen = 0;

	u32 force = TX_FORCE_V(!submode);

	u32 force = is_t5(lldi->adapter_type) ? TX_FORCE_V(!submode) :

		    T6_TX_FORCE_F;



	if (cxgbit_skcb_flags(skb) & SKCBF_TX_ISO) {

		opcode = FW_ISCSI_TX_DATA_WR;