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

Commit 2126bc5e authored by Karen Xie's avatar Karen Xie Committed by David S. Miller
Browse files

cxgb4i: use set_wr_txq() to set tx queues 



use cxgb4's set_wr_txq() for setting of the tx queue for a outgoing packet.
remove the similar function in cxgb4i.

Signed-off-by: default avatarKaren Xie <kxie@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7bcd2e1

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c

+5 −11
Original line number Diff line number Diff line
@@ -158,12 +158,6 @@ static struct scsi_transport_template *cxgb4i_stt; 
#define RCV_BUFSIZ_MASK		0x3FFU

#define MAX_IMM_TX_PKT_LEN	128



static inline void set_queue(struct sk_buff *skb, unsigned int queue,

				const struct cxgbi_sock *csk)

{

	skb->queue_mapping = queue;

}



static int push_tx_frames(struct cxgbi_sock *, int);



/*
@@ -405,7 +399,7 @@ static void send_abort_req(struct cxgbi_sock *csk) 


	csk->cpl_abort_req = NULL;

	req = (struct cpl_abort_req *)skb->head;

	set_queue(skb, CPL_PRIORITY_DATA, csk);

	set_wr_txq(skb, CPL_PRIORITY_DATA, csk->port_id);

	req->cmd = CPL_ABORT_SEND_RST;

	t4_set_arp_err_handler(skb, csk, abort_arp_failure);

	INIT_TP_WR(req, csk->tid);
@@ -431,7 +425,7 @@ static void send_abort_rpl(struct cxgbi_sock *csk, int rst_status) 
		csk, csk->state, csk->flags, csk->tid, rst_status);



	csk->cpl_abort_rpl = NULL;

	set_queue(skb, CPL_PRIORITY_DATA, csk);

	set_wr_txq(skb, CPL_PRIORITY_DATA, csk->port_id);

	INIT_TP_WR(rpl, csk->tid);

	OPCODE_TID(rpl) = cpu_to_be32(MK_OPCODE_TID(CPL_ABORT_RPL, csk->tid));

	rpl->cmd = rst_status;
@@ -557,7 +551,7 @@ static inline int send_tx_flowc_wr(struct cxgbi_sock *csk) 
	flowc->mnemval[8].mnemonic = FW_FLOWC_MNEM_TXDATAPLEN_MAX;

	flowc->mnemval[8].val = 16384;



	set_queue(skb, CPL_PRIORITY_DATA, csk);

	set_wr_txq(skb, CPL_PRIORITY_DATA, csk->port_id);



	log_debug(1 << CXGBI_DBG_TOE | 1 << CXGBI_DBG_SOCK,

		"csk 0x%p, tid 0x%x, %u,%u,%u,%u,%u,%u,%u.\n",
@@ -663,7 +657,7 @@ static int push_tx_frames(struct cxgbi_sock *csk, int req_completion) 
			break;

		}

		__skb_unlink(skb, &csk->write_queue);

		set_queue(skb, CPL_PRIORITY_DATA, csk);

		set_wr_txq(skb, CPL_PRIORITY_DATA, csk->port_id);

		skb->csum = credits_needed + flowclen16;

		csk->wr_cred -= credits_needed;

		csk->wr_una_cred += credits_needed;
@@ -1555,7 +1549,7 @@ static int ddp_ppod_write_idata(struct cxgbi_device *cdev, unsigned int port_id, 
		return -ENOMEM;

	}

	req = (struct ulp_mem_io *)skb->head;

	set_queue(skb, CPL_PRIORITY_CONTROL, NULL);

	set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);



	ulp_mem_io_set_hdr(lldi, req, wr_len, dlen, pm_addr);

	idata = (struct ulptx_idata *)(req + 1);