diff options
| author | kxie@chelsio.com <kxie@chelsio.com> | 2010-09-23 16:43:23 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-10-07 17:19:32 -0500 |
| commit | 24d3f95a5b6082ca4aba89071ca6259e15d3e564 (patch) | |
| tree | d353b736c4e201589ef9ffb1db5c26a3204422ea /drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | |
| parent | d24099df9e379b150c164da354b8c6fdafc73257 (diff) | |
| download | linux-stable-24d3f95a5b6082ca4aba89071ca6259e15d3e564.tar.gz linux-stable-24d3f95a5b6082ca4aba89071ca6259e15d3e564.tar.bz2 linux-stable-24d3f95a5b6082ca4aba89071ca6259e15d3e564.zip | |
[SCSI] cxgbi: rename alloc_cpl to alloc_wr
Signed-off-by: Karen Xie <kxie@chelsio.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/cxgbi/cxgb3i/cxgb3i.c')
| -rw-r--r-- | drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c index a01c1e238938..a2c207f57d61 100644 --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c @@ -320,7 +320,7 @@ static u32 send_rx_credits(struct cxgbi_sock *csk, u32 credits) "csk 0x%p,%u,0x%lx,%u, credit %u, dack %u.\n", csk, csk->state, csk->flags, csk->tid, credits, dack); - skb = alloc_cpl(sizeof(*req), 0, GFP_ATOMIC); + skb = alloc_wr(sizeof(*req), 0, GFP_ATOMIC); if (!skb) { pr_info("csk 0x%p, credit %u, OOM.\n", csk, credits); return 0; @@ -572,7 +572,7 @@ static void act_open_retry_timer(unsigned long data) cxgbi_sock_get(csk); spin_lock_bh(&csk->lock); - skb = alloc_cpl(sizeof(struct cpl_act_open_req), 0, GFP_ATOMIC); + skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_ATOMIC); if (!skb) cxgbi_sock_fail_act_open(csk, -ENOMEM); else { @@ -881,16 +881,16 @@ static int do_wr_ack(struct t3cdev *cdev, struct sk_buff *skb, void *ctx) */ static int alloc_cpls(struct cxgbi_sock *csk) { - csk->cpl_close = alloc_cpl(sizeof(struct cpl_close_con_req), 0, + csk->cpl_close = alloc_wr(sizeof(struct cpl_close_con_req), 0, GFP_KERNEL); if (!csk->cpl_close) return -ENOMEM; - csk->cpl_abort_req = alloc_cpl(sizeof(struct cpl_abort_req), 0, + csk->cpl_abort_req = alloc_wr(sizeof(struct cpl_abort_req), 0, GFP_KERNEL); if (!csk->cpl_abort_req) goto free_cpl_skbs; - csk->cpl_abort_rpl = alloc_cpl(sizeof(struct cpl_abort_rpl), 0, + csk->cpl_abort_rpl = alloc_wr(sizeof(struct cpl_abort_rpl), 0, GFP_KERNEL); if (!csk->cpl_abort_rpl) goto free_cpl_skbs; @@ -972,7 +972,7 @@ static int init_act_open(struct cxgbi_sock *csk) cxgbi_sock_set_flag(csk, CTPF_HAS_ATID); cxgbi_sock_get(csk); - skb = alloc_cpl(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL); + skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL); if (!skb) goto rel_resource; skb->sk = (struct sock *)csk; @@ -1141,7 +1141,7 @@ static int ddp_alloc_gl_skb(struct cxgbi_ddp_info *ddp, int idx, "ddp 0x%p, idx %d, cnt %d.\n", ddp, idx, cnt); for (i = 0; i < cnt; i++) { - struct sk_buff *skb = alloc_cpl(sizeof(struct ulp_mem_io) + + struct sk_buff *skb = alloc_wr(sizeof(struct ulp_mem_io) + PPOD_SIZE, 0, gfp); if (skb) { ddp->gl_skb[idx + i] = skb; @@ -1156,7 +1156,7 @@ static int ddp_alloc_gl_skb(struct cxgbi_ddp_info *ddp, int idx, static int ddp_setup_conn_pgidx(struct cxgbi_sock *csk, unsigned int tid, int pg_idx, bool reply) { - struct sk_buff *skb = alloc_cpl(sizeof(struct cpl_set_tcb_field), 0, + struct sk_buff *skb = alloc_wr(sizeof(struct cpl_set_tcb_field), 0, GFP_KERNEL); struct cpl_set_tcb_field *req; u64 val = pg_idx < DDP_PGIDX_MAX ? pg_idx : 0; @@ -1193,7 +1193,7 @@ static int ddp_setup_conn_pgidx(struct cxgbi_sock *csk, static int ddp_setup_conn_digest(struct cxgbi_sock *csk, unsigned int tid, int hcrc, int dcrc, int reply) { - struct sk_buff *skb = alloc_cpl(sizeof(struct cpl_set_tcb_field), 0, + struct sk_buff *skb = alloc_wr(sizeof(struct cpl_set_tcb_field), 0, GFP_KERNEL); struct cpl_set_tcb_field *req; u64 val = (hcrc ? 1 : 0) | (dcrc ? 2 : 0); |