p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libcxgb,iw_cxgb4,cxgbit: add cxgb_mk_abort_req() 

Add cxgb_mk_abort_req() to remove duplicate code
to form CPL_ABORT_REQ hardware command.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Varun Prakash 2016-09-13 21:24:04 +05:30 committed by David S. Miller
parent 29fb6f42e7
commit a7e1a97f88
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/infiniband/hw/cxgb4/cm.c
View File

@ -652,21 +652,16 @@ static int send_halfclose(struct c4iw_ep *ep)
static int send_abort(struct c4iw_ep *ep) static int send_abort(struct c4iw_ep *ep)
{ {
struct cpl_abort_req *req; u32 wrlen = roundup(sizeof(struct cpl_abort_req), 16);
int wrlen = roundup(sizeof *req, 16);
struct sk_buff *req_skb = skb_dequeue(&ep->com.ep_skb_list); struct sk_buff *req_skb = skb_dequeue(&ep->com.ep_skb_list);
PDBG("%s ep %p tid %u\n", __func__, ep, ep->hwtid); PDBG("%s ep %p tid %u\n", __func__, ep, ep->hwtid);
if (WARN_ON(!req_skb)) if (WARN_ON(!req_skb))
return -ENOMEM; return -ENOMEM;
set_wr_txq(req_skb, CPL_PRIORITY_DATA, ep->txq_idx); cxgb_mk_abort_req(req_skb, wrlen, ep->hwtid, ep->txq_idx,
t4_set_arp_err_handler(req_skb, ep, abort_arp_failure); ep, abort_arp_failure);
req = (struct cpl_abort_req *)skb_put(req_skb, wrlen);
memset(req, 0, wrlen);
INIT_TP_WR(req, ep->hwtid);
OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_ABORT_REQ, ep->hwtid));
req->cmd = CPL_ABORT_SEND_RST;
return c4iw_l2t_send(&ep->com.dev->rdev, req_skb, ep->l2t); return c4iw_l2t_send(&ep->com.dev->rdev, req_skb, ep->l2t);
} }

16
drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.h
View File

@ -112,4 +112,20 @@ cxgb_mk_close_con_req(struct sk_buff *skb, u32 len, u32 tid, u16 chan,
set_wr_txq(skb, CPL_PRIORITY_DATA, chan); set_wr_txq(skb, CPL_PRIORITY_DATA, chan);
t4_set_arp_err_handler(skb, handle, handler); t4_set_arp_err_handler(skb, handle, handler);
} }
static inline void
cxgb_mk_abort_req(struct sk_buff *skb, u32 len, u32 tid, u16 chan,
void *handle, arp_err_handler_t handler)
{
struct cpl_abort_req *req;
req = (struct cpl_abort_req *)__skb_put(skb, len);
memset(req, 0, len);
INIT_TP_WR(req, tid);
OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_ABORT_REQ, tid));
req->cmd = CPL_ABORT_SEND_RST;
set_wr_txq(skb, CPL_PRIORITY_DATA, chan);
t4_set_arp_err_handler(skb, handle, handler);
}
#endif #endif

13
drivers/target/iscsi/cxgbit/cxgbit_cm.c
View File

@ -647,9 +647,8 @@ static void cxgbit_abort_arp_failure(void *handle, struct sk_buff *skb)
static int cxgbit_send_abort_req(struct cxgbit_sock *csk) static int cxgbit_send_abort_req(struct cxgbit_sock *csk)
{ {
struct cpl_abort_req *req;
unsigned int len = roundup(sizeof(*req), 16);
struct sk_buff *skb; struct sk_buff *skb;
u32 len = roundup(sizeof(struct cpl_abort_req), 16);
pr_debug("%s: csk %p tid %u; state %d\n", pr_debug("%s: csk %p tid %u; state %d\n",
__func__, csk, csk->tid, csk->com.state); __func__, csk, csk->tid, csk->com.state);
@ -660,15 +659,9 @@ static int cxgbit_send_abort_req(struct cxgbit_sock *csk)
cxgbit_send_tx_flowc_wr(csk); cxgbit_send_tx_flowc_wr(csk);
skb = __skb_dequeue(&csk->skbq); skb = __skb_dequeue(&csk->skbq);
req = (struct cpl_abort_req *)__skb_put(skb, len); cxgb_mk_abort_req(skb, len, csk->tid, csk->txq_idx,
memset(req, 0, len); csk->com.cdev, cxgbit_abort_arp_failure);
set_wr_txq(skb, CPL_PRIORITY_DATA, csk->txq_idx);
t4_set_arp_err_handler(skb, csk->com.cdev, cxgbit_abort_arp_failure);
INIT_TP_WR(req, csk->tid);
OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_ABORT_REQ,
csk->tid));
req->cmd = CPL_ABORT_SEND_RST;
return cxgbit_l2t_send(csk->com.cdev, skb, csk->l2t); return cxgbit_l2t_send(csk->com.cdev, skb, csk->l2t);
} }